[PATCH v3 1/5] d3dcompiler: Rename ID3D11ShaderReflection functions to d3d11_... from d3dcompiler_...
Paul Gofman
pgofman at codeweavers.com
Tue Aug 11 07:30:22 CDT 2020
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
v2, v3:
- no changes.
dlls/d3dcompiler_43/reflection.c | 578 +++++++++++++++----------------
1 file changed, 287 insertions(+), 291 deletions(-)
diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index 729501dbddc..9a1e869f0a5 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -145,9 +145,9 @@ struct d3dcompiler_shader_reflection
static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset);
-static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl;
-static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl;
-static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl;
+static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl;
+static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl;
+static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl;
static const struct ID3D10ShaderReflectionConstantBufferVtbl d3d10_shader_reflection_constant_buffer_vtbl;
static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_variable_vtbl;
@@ -156,17 +156,17 @@ static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_
/* null objects - needed for invalid calls */
static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer =
{
- {&d3dcompiler_shader_reflection_constant_buffer_vtbl},
+ {&d3d11_shader_reflection_constant_buffer_vtbl},
{&d3d10_shader_reflection_constant_buffer_vtbl}
};
static struct d3dcompiler_shader_reflection_type null_type =
{
- {&d3dcompiler_shader_reflection_type_vtbl},
+ {&d3d11_shader_reflection_type_vtbl},
{&d3d10_shader_reflection_type_vtbl}
};
static struct d3dcompiler_shader_reflection_variable null_variable =
{
- {&d3dcompiler_shader_reflection_variable_vtbl},
+ {&d3d11_shader_reflection_variable_vtbl},
{&d3d10_shader_reflection_variable_vtbl},
&null_constant_buffer,
&null_type
@@ -327,9 +327,9 @@ static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflec
return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface);
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object)
{
- TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_ID3D11ShaderReflection)
|| IsEqualGUID(riid, &IID_IUnknown))
@@ -339,33 +339,33 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID
return S_OK;
}
- WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*object = NULL;
return E_NOINTERFACE;
}
-static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface)
+static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_AddRef(ID3D11ShaderReflection *iface)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
- ULONG refcount = InterlockedIncrement(&This->refcount);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
+ ULONG refcount = InterlockedIncrement(&reflection->refcount);
- TRACE("%p increasing refcount to %u\n", This, refcount);
+ TRACE("%p increasing refcount to %u.\n", reflection, refcount);
return refcount;
}
-static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface)
+static ULONG STDMETHODCALLTYPE d3d11_shader_reflection_Release(ID3D11ShaderReflection *iface)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
- ULONG refcount = InterlockedDecrement(&This->refcount);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
+ ULONG refcount = InterlockedDecrement(&reflection->refcount);
- TRACE("%p decreasing refcount to %u\n", This, refcount);
+ TRACE("%p decreasing refcount to %u.\n", reflection, refcount);
if (!refcount)
{
- reflection_cleanup(This);
- HeapFree(GetProcessHeap(), 0, This);
+ reflection_cleanup(reflection);
+ HeapFree(GetProcessHeap(), 0, reflection);
}
return refcount;
@@ -373,53 +373,53 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade
/* ID3D11ShaderReflection methods */
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- FIXME("iface %p, desc %p partial stub!\n", iface, desc);
+ FIXME("iface %p, desc %p partial stub.\n", iface, desc);
if (!desc)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_FAIL;
}
- desc->Version = This->version;
- desc->Creator = This->creator;
- desc->Flags = This->flags;
- desc->ConstantBuffers = This->constant_buffer_count;
- desc->BoundResources = This->bound_resource_count;
- desc->InputParameters = This->isgn ? This->isgn->element_count : 0;
- desc->OutputParameters = This->osgn ? This->osgn->element_count : 0;
- desc->InstructionCount = This->instruction_count;
- desc->TempRegisterCount = This->temp_register_count;
- desc->TempArrayCount = This->temp_array_count;
+ desc->Version = reflection->version;
+ desc->Creator = reflection->creator;
+ desc->Flags = reflection->flags;
+ desc->ConstantBuffers = reflection->constant_buffer_count;
+ desc->BoundResources = reflection->bound_resource_count;
+ desc->InputParameters = reflection->isgn ? reflection->isgn->element_count : 0;
+ desc->OutputParameters = reflection->osgn ? reflection->osgn->element_count : 0;
+ desc->InstructionCount = reflection->instruction_count;
+ desc->TempRegisterCount = reflection->temp_register_count;
+ desc->TempArrayCount = reflection->temp_array_count;
desc->DefCount = 0;
- desc->DclCount = This->dcl_count;
- desc->TextureNormalInstructions = This->texture_normal_instructions;
- desc->TextureLoadInstructions = This->texture_load_instructions;
- desc->TextureCompInstructions = This->texture_comp_instructions;
- desc->TextureBiasInstructions = This->texture_bias_instructions;
- desc->TextureGradientInstructions = This->texture_gradient_instructions;
- desc->FloatInstructionCount = This->float_instruction_count;
- desc->IntInstructionCount = This->int_instruction_count;
- desc->UintInstructionCount = This->uint_instruction_count;
- desc->StaticFlowControlCount = This->static_flow_control_count;
- desc->DynamicFlowControlCount = This->dynamic_flow_control_count;
+ desc->DclCount = reflection->dcl_count;
+ desc->TextureNormalInstructions = reflection->texture_normal_instructions;
+ desc->TextureLoadInstructions = reflection->texture_load_instructions;
+ desc->TextureCompInstructions = reflection->texture_comp_instructions;
+ desc->TextureBiasInstructions = reflection->texture_bias_instructions;
+ desc->TextureGradientInstructions = reflection->texture_gradient_instructions;
+ desc->FloatInstructionCount = reflection->float_instruction_count;
+ desc->IntInstructionCount = reflection->int_instruction_count;
+ desc->UintInstructionCount = reflection->uint_instruction_count;
+ desc->StaticFlowControlCount = reflection->static_flow_control_count;
+ desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count;
desc->MacroInstructionCount = 0;
- desc->ArrayInstructionCount = This->array_instruction_count;
- desc->CutInstructionCount = This->cut_instruction_count;
- desc->EmitInstructionCount = This->emit_instruction_count;
- desc->GSOutputTopology = This->gs_output_topology;
- desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count;
- desc->InputPrimitive = This->input_primitive;
- desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0;
+ desc->ArrayInstructionCount = reflection->array_instruction_count;
+ desc->CutInstructionCount = reflection->cut_instruction_count;
+ desc->EmitInstructionCount = reflection->emit_instruction_count;
+ desc->GSOutputTopology = reflection->gs_output_topology;
+ desc->GSMaxOutputVertexCount = reflection->gs_max_output_vertex_count;
+ desc->InputPrimitive = reflection->input_primitive;
+ desc->PatchConstantParameters = reflection->pcsg ? reflection->pcsg->element_count : 0;
desc->cGSInstanceCount = 0;
- desc->cControlPoints = This->c_control_points;
- desc->HSOutputPrimitive = This->hs_output_primitive;
- desc->HSPartitioning = This->hs_prtitioning;
- desc->TessellatorDomain = This->tessellator_domain;
+ desc->cControlPoints = reflection->c_control_points;
+ desc->HSOutputPrimitive = reflection->hs_output_primitive;
+ desc->HSPartitioning = reflection->hs_prtitioning;
+ desc->TessellatorDomain = reflection->tessellator_domain;
desc->cBarrierInstructions = 0;
desc->cInterlockedInstructions = 0;
desc->cTextureStoreInstructions = 0;
@@ -427,39 +427,39 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha
return S_OK;
}
-static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex(
- ID3D11ShaderReflection *iface, UINT index)
+static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByIndex
+ (ID3D11ShaderReflection *iface, UINT index)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p, index %u\n", iface, index);
+ TRACE("iface %p, index %u.\n", iface, index);
- if (index >= This->constant_buffer_count)
+ if (index >= reflection->constant_buffer_count)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface;
}
- return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface;
+ return &reflection->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface;
}
-static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName(
- ID3D11ShaderReflection *iface, const char *name)
+static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_GetConstantBufferByName
+ (ID3D11ShaderReflection *iface, const char *name)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
unsigned int i;
- TRACE("iface %p, name %s\n", iface, debugstr_a(name));
+ TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
if (!name)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface;
}
- for (i = 0; i < This->constant_buffer_count; ++i)
+ for (i = 0; i < reflection->constant_buffer_count; ++i)
{
- struct d3dcompiler_shader_reflection_constant_buffer *d = &This->constant_buffers[i];
+ struct d3dcompiler_shader_reflection_constant_buffer *d = &reflection->constant_buffers[i];
if (!strcmp(d->name, name))
{
@@ -468,21 +468,21 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil
}
}
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc(
- ID3D11ShaderReflection *iface, UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDesc(ID3D11ShaderReflection *iface,
+ UINT index, D3D11_SHADER_INPUT_BIND_DESC *desc)
{
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p, index %u, desc %p\n", iface, index, desc);
+ TRACE("iface %p, index %u, desc %p.\n", iface, index, desc);
if (!desc || index >= reflection->bound_resource_count)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_INVALIDARG;
}
@@ -491,16 +491,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc(
- ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetInputParameterDesc(ID3D11ShaderReflection *iface,
+ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
{
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p, index %u, desc %p\n", iface, index, desc);
+ TRACE("iface %p, index %u, desc %p.\n", iface, index, desc);
if (!desc || !reflection->isgn || index >= reflection->isgn->element_count)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_INVALIDARG;
}
@@ -509,16 +509,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc(
- ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetOutputParameterDesc(ID3D11ShaderReflection *iface,
+ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
{
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p, index %u, desc %p\n", iface, index, desc);
+ TRACE("iface %p, index %u, desc %p.\n", iface, index, desc);
if (!desc || !reflection->osgn || index >= reflection->osgn->element_count)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_INVALIDARG;
}
@@ -527,16 +527,16 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete
return S_OK;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc(
- ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetPatchConstantParameterDesc(ID3D11ShaderReflection *iface,
+ UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc)
{
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p, index %u, desc %p\n", iface, index, desc);
+ TRACE("iface %p, index %u, desc %p.\n", iface, index, desc);
if (!desc || !reflection->pcsg || index >= reflection->pcsg->element_count)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_INVALIDARG;
}
@@ -545,23 +545,23 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantP
return S_OK;
}
-static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName(
- ID3D11ShaderReflection *iface, const char *name)
+static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_GetVariableByName
+ (ID3D11ShaderReflection *iface, const char *name)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
unsigned int i, k;
- TRACE("iface %p, name %s\n", iface, debugstr_a(name));
+ TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
if (!name)
{
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return &null_variable.ID3D11ShaderReflectionVariable_iface;
}
- for (i = 0; i < This->constant_buffer_count; ++i)
+ for (i = 0; i < reflection->constant_buffer_count; ++i)
{
- struct d3dcompiler_shader_reflection_constant_buffer *cb = &This->constant_buffers[i];
+ struct d3dcompiler_shader_reflection_constant_buffer *cb = &reflection->constant_buffers[i];
for (k = 0; k < cb->variable_count; ++k)
{
@@ -575,28 +575,28 @@ static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_sha
}
}
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return &null_variable.ID3D11ShaderReflectionVariable_iface;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDescByName(
- ID3D11ShaderReflection *iface, const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetResourceBindingDescByName(ID3D11ShaderReflection *iface,
+ const char *name, D3D11_SHADER_INPUT_BIND_DESC *desc)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
unsigned int i;
- TRACE("iface %p, name %s, desc %p\n", iface, debugstr_a(name), desc);
+ TRACE("iface %p, name %s, desc %p.\n", iface, debugstr_a(name), desc);
if (!desc || !name)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_INVALIDARG;
}
- for (i = 0; i < This->bound_resource_count; ++i)
+ for (i = 0; i < reflection->bound_resource_count; ++i)
{
- D3D12_SHADER_INPUT_BIND_DESC *d = &This->bound_resources[i];
+ D3D12_SHADER_INPUT_BIND_DESC *d = &reflection->bound_resources[i];
if (!strcmp(d->Name, name))
{
@@ -606,191 +606,185 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin
}
}
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return E_INVALIDARG;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount(
- ID3D11ShaderReflection *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovInstructionCount(ID3D11ShaderReflection *iface)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p\n", iface);
+ TRACE("iface %p.\n", iface);
- return This->mov_instruction_count;
+ return reflection->mov_instruction_count;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCount(
- ID3D11ShaderReflection *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetMovcInstructionCount(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return 0;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConversionInstructionCount(
- ID3D11ShaderReflection *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetConversionInstructionCount(ID3D11ShaderReflection *iface)
{
- struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
+ struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface);
- TRACE("iface %p\n", iface);
+ TRACE("iface %p.\n", iface);
- return This->conversion_instruction_count;
+ return reflection->conversion_instruction_count;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetBitwiseInstructionCount(
- ID3D11ShaderReflection *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetBitwiseInstructionCount(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return 0;
}
-static D3D_PRIMITIVE STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetGSInputPrimitive(
- ID3D11ShaderReflection *iface)
+static D3D_PRIMITIVE STDMETHODCALLTYPE d3d11_shader_reflection_GetGSInputPrimitive(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return 0;
}
-static BOOL STDMETHODCALLTYPE d3dcompiler_shader_reflection_IsSampleFrequencyShader(
- ID3D11ShaderReflection *iface)
+static BOOL STDMETHODCALLTYPE d3d11_shader_reflection_IsSampleFrequencyShader(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return FALSE;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots(
- ID3D11ShaderReflection *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetNumInterfaceSlots(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return 0;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLevel(
- ID3D11ShaderReflection *iface, D3D_FEATURE_LEVEL *level)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_GetMinFeatureLevel(ID3D11ShaderReflection *iface,
+ D3D_FEATURE_LEVEL *level)
{
- FIXME("iface %p, level %p stub!\n", iface, level);
+ FIXME("iface %p, level %p stub.\n", iface, level);
return E_NOTIMPL;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize(
- ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_GetThreadGroupSize(ID3D11ShaderReflection *iface,
+ UINT *sizex, UINT *sizey, UINT *sizez)
{
- FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez);
+ FIXME("iface %p, sizex %p, sizey %p, sizez %p stub.\n", iface, sizex, sizey, sizez);
return 0;
}
-static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags(
- ID3D11ShaderReflection *iface)
+static UINT64 STDMETHODCALLTYPE d3d11_shader_reflection_GetRequiresFlags(ID3D11ShaderReflection *iface)
{
- FIXME("iface %p stub!\n", iface);
+ FIXME("iface %p stub.\n", iface);
return 0;
}
-static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl =
+static const struct ID3D11ShaderReflectionVtbl d3d11_shader_reflection_vtbl =
{
/* IUnknown methods */
- d3dcompiler_shader_reflection_QueryInterface,
- d3dcompiler_shader_reflection_AddRef,
- d3dcompiler_shader_reflection_Release,
+ d3d11_shader_reflection_QueryInterface,
+ d3d11_shader_reflection_AddRef,
+ d3d11_shader_reflection_Release,
/* ID3D11ShaderReflection methods */
- d3dcompiler_shader_reflection_GetDesc,
- d3dcompiler_shader_reflection_GetConstantBufferByIndex,
- d3dcompiler_shader_reflection_GetConstantBufferByName,
- d3dcompiler_shader_reflection_GetResourceBindingDesc,
- d3dcompiler_shader_reflection_GetInputParameterDesc,
- d3dcompiler_shader_reflection_GetOutputParameterDesc,
- d3dcompiler_shader_reflection_GetPatchConstantParameterDesc,
- d3dcompiler_shader_reflection_GetVariableByName,
- d3dcompiler_shader_reflection_GetResourceBindingDescByName,
- d3dcompiler_shader_reflection_GetMovInstructionCount,
- d3dcompiler_shader_reflection_GetMovcInstructionCount,
- d3dcompiler_shader_reflection_GetConversionInstructionCount,
- d3dcompiler_shader_reflection_GetBitwiseInstructionCount,
- d3dcompiler_shader_reflection_GetGSInputPrimitive,
- d3dcompiler_shader_reflection_IsSampleFrequencyShader,
- d3dcompiler_shader_reflection_GetNumInterfaceSlots,
- d3dcompiler_shader_reflection_GetMinFeatureLevel,
- d3dcompiler_shader_reflection_GetThreadGroupSize,
- d3dcompiler_shader_reflection_GetRequiresFlags,
+ d3d11_shader_reflection_GetDesc,
+ d3d11_shader_reflection_GetConstantBufferByIndex,
+ d3d11_shader_reflection_GetConstantBufferByName,
+ d3d11_shader_reflection_GetResourceBindingDesc,
+ d3d11_shader_reflection_GetInputParameterDesc,
+ d3d11_shader_reflection_GetOutputParameterDesc,
+ d3d11_shader_reflection_GetPatchConstantParameterDesc,
+ d3d11_shader_reflection_GetVariableByName,
+ d3d11_shader_reflection_GetResourceBindingDescByName,
+ d3d11_shader_reflection_GetMovInstructionCount,
+ d3d11_shader_reflection_GetMovcInstructionCount,
+ d3d11_shader_reflection_GetConversionInstructionCount,
+ d3d11_shader_reflection_GetBitwiseInstructionCount,
+ d3d11_shader_reflection_GetGSInputPrimitive,
+ d3d11_shader_reflection_IsSampleFrequencyShader,
+ d3d11_shader_reflection_GetNumInterfaceSlots,
+ d3d11_shader_reflection_GetMinFeatureLevel,
+ d3d11_shader_reflection_GetThreadGroupSize,
+ d3d11_shader_reflection_GetRequiresFlags,
};
/* ID3D11ShaderReflectionConstantBuffer methods */
-static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface)
+static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer
+ (ID3D11ShaderReflectionConstantBuffer *iface)
{
- return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface);
+ return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer,
+ ID3D11ShaderReflectionConstantBuffer_iface);
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc(
- ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetDesc
+ (ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc)
{
- struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
+ struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
- TRACE("iface %p, desc %p\n", iface, desc);
+ TRACE("iface %p, desc %p.\n", iface, desc);
- if (This == &null_constant_buffer)
+ if (cb == &null_constant_buffer)
{
- WARN("Null constant buffer specified\n");
+ WARN("Null constant buffer specified.\n");
return E_FAIL;
}
if (!desc)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_FAIL;
}
- desc->Name = This->name;
- desc->Type = This->type;
- desc->Variables = This->variable_count;
- desc->Size = This->size;
- desc->uFlags = This->flags;
+ desc->Name = cb->name;
+ desc->Type = cb->type;
+ desc->Variables = cb->variable_count;
+ desc->Size = cb->size;
+ desc->uFlags = cb->flags;
return S_OK;
}
-static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex(
- ID3D11ShaderReflectionConstantBuffer *iface, UINT index)
+static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByIndex
+ (ID3D11ShaderReflectionConstantBuffer *iface, UINT index)
{
- struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
+ struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
- TRACE("iface %p, index %u\n", iface, index);
+ TRACE("iface %p, index %u.\n", iface, index);
- if (index >= This->variable_count)
+ if (index >= cb->variable_count)
{
- WARN("Invalid index specified\n");
+ WARN("Invalid index specified.\n");
return &null_variable.ID3D11ShaderReflectionVariable_iface;
}
- return &This->variables[index].ID3D11ShaderReflectionVariable_iface;
+ return &cb->variables[index].ID3D11ShaderReflectionVariable_iface;
}
-static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName(
- ID3D11ShaderReflectionConstantBuffer *iface, const char *name)
+static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3d11_shader_reflection_constant_buffer_GetVariableByName
+ (ID3D11ShaderReflectionConstantBuffer *iface, const char *name)
{
- struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
+ struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D11ShaderReflectionConstantBuffer(iface);
unsigned int i;
- TRACE("iface %p, name %s\n", iface, debugstr_a(name));
+ TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
if (!name)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return &null_variable.ID3D11ShaderReflectionVariable_iface;
}
- for (i = 0; i < This->variable_count; ++i)
+ for (i = 0; i < cb->variable_count; ++i)
{
- struct d3dcompiler_shader_reflection_variable *v = &This->variables[i];
+ struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i];
if (!strcmp(v->name, name))
{
@@ -799,155 +793,158 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref
}
}
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return &null_variable.ID3D11ShaderReflectionVariable_iface;
}
-static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl =
+static const struct ID3D11ShaderReflectionConstantBufferVtbl d3d11_shader_reflection_constant_buffer_vtbl =
{
/* ID3D11ShaderReflectionConstantBuffer methods */
- d3dcompiler_shader_reflection_constant_buffer_GetDesc,
- d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex,
- d3dcompiler_shader_reflection_constant_buffer_GetVariableByName,
+ d3d11_shader_reflection_constant_buffer_GetDesc,
+ d3d11_shader_reflection_constant_buffer_GetVariableByIndex,
+ d3d11_shader_reflection_constant_buffer_GetVariableByName,
};
/* ID3D11ShaderReflectionVariable methods */
-static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariable *iface)
+static inline struct d3dcompiler_shader_reflection_variable *impl_from_ID3D11ShaderReflectionVariable
+ (ID3D11ShaderReflectionVariable *iface)
{
- return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable, ID3D11ShaderReflectionVariable_iface);
+ return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_variable,
+ ID3D11ShaderReflectionVariable_iface);
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc(
- ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetDesc
+ (ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc)
{
- struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface);
+ struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface);
- TRACE("iface %p, desc %p\n", iface, desc);
+ TRACE("iface %p, desc %p.\n", iface, desc);
- if (This == &null_variable)
+ if (cb == &null_variable)
{
- WARN("Null variable specified\n");
+ WARN("Null variable specified.\n");
return E_FAIL;
}
if (!desc)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_FAIL;
}
- desc->Name = This->name;
- desc->StartOffset = This->start_offset;
- desc->Size = This->size;
- desc->uFlags = This->flags;
- desc->DefaultValue = This->default_value;
+ desc->Name = cb->name;
+ desc->StartOffset = cb->start_offset;
+ desc->Size = cb->size;
+ desc->uFlags = cb->flags;
+ desc->DefaultValue = cb->default_value;
return S_OK;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType(
- ID3D11ShaderReflectionVariable *iface)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetType
+ (ID3D11ShaderReflectionVariable *iface)
{
- struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface);
+ struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface);
- TRACE("iface %p\n", iface);
+ TRACE("iface %p.\n", iface);
- return &This->type->ID3D11ShaderReflectionType_iface;
+ return &cb->type->ID3D11ShaderReflectionType_iface;
}
-static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer(
- ID3D11ShaderReflectionVariable *iface)
+static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetBuffer
+ (ID3D11ShaderReflectionVariable *iface)
{
- struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface);
+ struct d3dcompiler_shader_reflection_variable *cb = impl_from_ID3D11ShaderReflectionVariable(iface);
- TRACE("iface %p\n", iface);
+ TRACE("iface %p.\n", iface);
- return &This->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface;
+ return &cb->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot(
- ID3D11ShaderReflectionVariable *iface, UINT index)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_variable_GetInterfaceSlot
+ (ID3D11ShaderReflectionVariable *iface, UINT index)
{
- FIXME("iface %p, index %u stub!\n", iface, index);
+ FIXME("iface %p, index %u stub.\n", iface, index);
return 0;
}
-static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl =
+static const struct ID3D11ShaderReflectionVariableVtbl d3d11_shader_reflection_variable_vtbl =
{
/* ID3D11ShaderReflectionVariable methods */
- d3dcompiler_shader_reflection_variable_GetDesc,
- d3dcompiler_shader_reflection_variable_GetType,
- d3dcompiler_shader_reflection_variable_GetBuffer,
- d3dcompiler_shader_reflection_variable_GetInterfaceSlot,
+ d3d11_shader_reflection_variable_GetDesc,
+ d3d11_shader_reflection_variable_GetType,
+ d3d11_shader_reflection_variable_GetBuffer,
+ d3d11_shader_reflection_variable_GetInterfaceSlot,
};
/* ID3D11ShaderReflectionType methods */
-static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType(ID3D11ShaderReflectionType *iface)
+static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D11ShaderReflectionType
+ (ID3D11ShaderReflectionType *iface)
{
return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D11ShaderReflectionType_iface);
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc(
- ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetDesc
+ (ID3D11ShaderReflectionType *iface, D3D11_SHADER_TYPE_DESC *desc)
{
- struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface);
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface);
- TRACE("iface %p, desc %p\n", iface, desc);
+ TRACE("iface %p, desc %p.\n", iface, desc);
- if (This == &null_type)
+ if (type == &null_type)
{
- WARN("Null type specified\n");
+ WARN("Null type specified.\n");
return E_FAIL;
}
if (!desc)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return E_FAIL;
}
- *desc = This->desc;
+ *desc = type->desc;
return S_OK;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex(
- ID3D11ShaderReflectionType *iface, UINT index)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByIndex
+ (ID3D11ShaderReflectionType *iface, UINT index)
{
- struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface);
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface);
- TRACE("iface %p, index %u\n", iface, index);
+ TRACE("iface %p, index %u.\n", iface, index);
- if (index >= This->desc.Members)
+ if (index >= type->desc.Members)
{
- WARN("Invalid index specified\n");
+ WARN("Invalid index specified.\n");
return &null_type.ID3D11ShaderReflectionType_iface;
}
- return &This->members[index].type->ID3D11ShaderReflectionType_iface;
+ return &type->members[index].type->ID3D11ShaderReflectionType_iface;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName(
- ID3D11ShaderReflectionType *iface, const char *name)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeByName
+ (ID3D11ShaderReflectionType *iface, const char *name)
{
- struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface);
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface);
unsigned int i;
- TRACE("iface %p, name %s\n", iface, debugstr_a(name));
+ TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
if (!name)
{
- WARN("Invalid argument specified\n");
+ WARN("Invalid argument specified.\n");
return &null_type.ID3D11ShaderReflectionType_iface;
}
- for (i = 0; i < This->desc.Members; ++i)
+ for (i = 0; i < type->desc.Members; ++i)
{
- struct d3dcompiler_shader_reflection_type_member *member = &This->members[i];
+ struct d3dcompiler_shader_reflection_type_member *member = &type->members[i];
if (!strcmp(member->name, name))
{
@@ -956,43 +953,43 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect
}
}
- WARN("Invalid name specified\n");
+ WARN("Invalid name specified.\n");
return &null_type.ID3D11ShaderReflectionType_iface;
}
-static const char * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName(
- ID3D11ShaderReflectionType *iface, UINT index)
+static const char * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetMemberTypeName
+ (ID3D11ShaderReflectionType *iface, UINT index)
{
- struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface);
+ struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D11ShaderReflectionType(iface);
- TRACE("iface %p, index %u\n", iface, index);
+ TRACE("iface %p, index %u.\n", iface, index);
- if (This == &null_type)
+ if (type == &null_type)
{
- WARN("Null type specified\n");
+ WARN("Null type specified.\n");
return "$Invalid";
}
- if (index >= This->desc.Members)
+ if (index >= type->desc.Members)
{
- WARN("Invalid index specified\n");
+ WARN("Invalid index specified.\n");
return NULL;
}
- return This->members[index].name;
+ return type->members[index].name;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual(
- ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsEqual
+ (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type)
{
- struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface);
+ struct d3dcompiler_shader_reflection_type *reflection_type = impl_from_ID3D11ShaderReflectionType(iface);
- TRACE("iface %p, type %p\n", iface, type);
+ TRACE("iface %p, type %p.\n", iface, type);
- if (This == &null_type)
+ if (reflection_type == &null_type)
{
- WARN("Null type specified\n");
+ WARN("Null type specified.\n");
return E_FAIL;
}
@@ -1002,68 +999,67 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual(
return S_FALSE;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType(
- ID3D11ShaderReflectionType *iface)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetSubType
+ (ID3D11ShaderReflectionType *iface)
{
FIXME("iface %p stub!\n", iface);
return NULL;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetBaseClass(
- ID3D11ShaderReflectionType *iface)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetBaseClass
+ (ID3D11ShaderReflectionType *iface)
{
FIXME("iface %p stub!\n", iface);
return NULL;
}
-static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetNumInterfaces(
- ID3D11ShaderReflectionType *iface)
+static UINT STDMETHODCALLTYPE d3d11_shader_reflection_type_GetNumInterfaces(ID3D11ShaderReflectionType *iface)
{
FIXME("iface %p stub!\n", iface);
return 0;
}
-static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetInterfaceByIndex(
- ID3D11ShaderReflectionType *iface, UINT index)
+static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3d11_shader_reflection_type_GetInterfaceByIndex
+ (ID3D11ShaderReflectionType *iface, UINT index)
{
FIXME("iface %p, index %u stub!\n", iface, index);
return NULL;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsOfType(
- ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_IsOfType
+ (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type)
{
FIXME("iface %p, type %p stub!\n", iface, type);
return E_NOTIMPL;
}
-static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_ImplementsInterface(
- ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base)
+static HRESULT STDMETHODCALLTYPE d3d11_shader_reflection_type_ImplementsInterface
+ (ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *base)
{
FIXME("iface %p, base %p stub!\n", iface, base);
return E_NOTIMPL;
}
-static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl =
+static const struct ID3D11ShaderReflectionTypeVtbl d3d11_shader_reflection_type_vtbl =
{
/* ID3D11ShaderReflectionType methods */
- d3dcompiler_shader_reflection_type_GetDesc,
- d3dcompiler_shader_reflection_type_GetMemberTypeByIndex,
- d3dcompiler_shader_reflection_type_GetMemberTypeByName,
- d3dcompiler_shader_reflection_type_GetMemberTypeName,
- d3dcompiler_shader_reflection_type_IsEqual,
- d3dcompiler_shader_reflection_type_GetSubType,
- d3dcompiler_shader_reflection_type_GetBaseClass,
- d3dcompiler_shader_reflection_type_GetNumInterfaces,
- d3dcompiler_shader_reflection_type_GetInterfaceByIndex,
- d3dcompiler_shader_reflection_type_IsOfType,
- d3dcompiler_shader_reflection_type_ImplementsInterface,
+ d3d11_shader_reflection_type_GetDesc,
+ d3d11_shader_reflection_type_GetMemberTypeByIndex,
+ d3d11_shader_reflection_type_GetMemberTypeByName,
+ d3d11_shader_reflection_type_GetMemberTypeName,
+ d3d11_shader_reflection_type_IsEqual,
+ d3d11_shader_reflection_type_GetSubType,
+ d3d11_shader_reflection_type_GetBaseClass,
+ d3d11_shader_reflection_type_GetNumInterfaces,
+ d3d11_shader_reflection_type_GetInterfaceByIndex,
+ d3d11_shader_reflection_type_IsOfType,
+ d3d11_shader_reflection_type_ImplementsInterface,
};
static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size)
@@ -1310,7 +1306,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d
if (!type)
return NULL;
- type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl;
+ type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3d11_shader_reflection_type_vtbl;
type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl;
type->id = offset;
type->reflection = reflection;
@@ -1352,7 +1348,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_
struct d3dcompiler_shader_reflection_variable *v = &variables[i];
DWORD offset;
- v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl;
+ v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3d11_shader_reflection_variable_vtbl;
v->ID3D10ShaderReflectionVariable_iface.lpVtbl = &d3d10_shader_reflection_variable_vtbl;
v->constant_buffer = cb;
@@ -1551,7 +1547,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
{
struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i];
- cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl;
+ cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d11_shader_reflection_constant_buffer_vtbl;
cb->ID3D10ShaderReflectionConstantBuffer_iface.lpVtbl = &d3d10_shader_reflection_constant_buffer_vtbl;
cb->reflection = r;
@@ -2375,7 +2371,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void
if (!object)
return E_OUTOFMEMORY;
- object->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl;
+ object->ID3D11ShaderReflection_iface.lpVtbl = &d3d11_shader_reflection_vtbl;
object->refcount = 1;
hr = d3dcompiler_shader_reflection_init(object, data, data_size);
--
2.26.2
More information about the wine-devel
mailing list