wined3d: D3DQUERYTYPE: Consistently use in WINED3D namespace.
This commit is contained in:
parent
837027fcb7
commit
f0d5b35c97
|
@ -1446,26 +1446,26 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE
|
|||
object->type = Type;
|
||||
/* allocated the 'extended' data based on the type of query requested */
|
||||
switch(Type){
|
||||
case D3DQUERYTYPE_OCCLUSION:
|
||||
case WINED3DQUERYTYPE_OCCLUSION:
|
||||
if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) {
|
||||
TRACE("(%p) Allocating data for an occlusion query\n", This);
|
||||
object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData));
|
||||
GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId));
|
||||
break;
|
||||
}
|
||||
case D3DQUERYTYPE_VCACHE:
|
||||
case D3DQUERYTYPE_RESOURCEMANAGER:
|
||||
case D3DQUERYTYPE_VERTEXSTATS:
|
||||
case D3DQUERYTYPE_EVENT:
|
||||
case D3DQUERYTYPE_TIMESTAMP:
|
||||
case D3DQUERYTYPE_TIMESTAMPDISJOINT:
|
||||
case D3DQUERYTYPE_TIMESTAMPFREQ:
|
||||
case D3DQUERYTYPE_PIPELINETIMINGS:
|
||||
case D3DQUERYTYPE_INTERFACETIMINGS:
|
||||
case D3DQUERYTYPE_VERTEXTIMINGS:
|
||||
case D3DQUERYTYPE_PIXELTIMINGS:
|
||||
case D3DQUERYTYPE_BANDWIDTHTIMINGS:
|
||||
case D3DQUERYTYPE_CACHEUTILIZATION:
|
||||
case WINED3DQUERYTYPE_VCACHE:
|
||||
case WINED3DQUERYTYPE_RESOURCEMANAGER:
|
||||
case WINED3DQUERYTYPE_VERTEXSTATS:
|
||||
case WINED3DQUERYTYPE_EVENT:
|
||||
case WINED3DQUERYTYPE_TIMESTAMP:
|
||||
case WINED3DQUERYTYPE_TIMESTAMPDISJOINT:
|
||||
case WINED3DQUERYTYPE_TIMESTAMPFREQ:
|
||||
case WINED3DQUERYTYPE_PIPELINETIMINGS:
|
||||
case WINED3DQUERYTYPE_INTERFACETIMINGS:
|
||||
case WINED3DQUERYTYPE_VERTEXTIMINGS:
|
||||
case WINED3DQUERYTYPE_PIXELTIMINGS:
|
||||
case WINED3DQUERYTYPE_BANDWIDTHTIMINGS:
|
||||
case WINED3DQUERYTYPE_CACHEUTILIZATION:
|
||||
default:
|
||||
object->extendedData = 0;
|
||||
FIXME("(%p) Unhandled query type %d\n",This , Type);
|
||||
|
|
|
@ -1185,9 +1185,9 @@ typedef struct IWineD3DQueryImpl
|
|||
#else
|
||||
IWineD3DDeviceImpl *wineD3DDevice;
|
||||
#endif
|
||||
/* IWineD3DQuery fields */
|
||||
|
||||
D3DQUERYTYPE type;
|
||||
/* IWineD3DQuery fields */
|
||||
WINED3DQUERYTYPE type;
|
||||
/* TODO: Think about using a IUnknown instead of a void* */
|
||||
void *extendedData;
|
||||
|
||||
|
|
Loading…
Reference in New Issue