Commit 70861505 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d10: Avoid LPCSTR.

parent 2cc421f5
......@@ -261,21 +261,21 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const
}
LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device)
const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
return "vs_4_0";
}
LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device)
const char * WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
return "gs_4_0";
}
LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device)
const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device)
{
FIXME("device %p stub!\n", device);
......
......@@ -93,9 +93,9 @@ static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_sha
}
static struct ID3D10ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d10_shader_reflection_GetConstantBufferByName(
ID3D10ShaderReflection *iface, LPCSTR name)
ID3D10ShaderReflection *iface, const char *name)
{
FIXME("iface %p, name \"%s\" stub!\n", iface, name);
FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name));
return NULL;
}
......
......@@ -795,8 +795,9 @@ typedef struct D3D10_SUBRESOURCE_DATA {
UINT SysMemSlicePitch;
} D3D10_SUBRESOURCE_DATA;
typedef struct D3D10_SO_DECLARATION_ENTRY {
LPCSTR SemanticName;
typedef struct D3D10_SO_DECLARATION_ENTRY
{
const char *SemanticName;
UINT SemanticIndex;
BYTE StartComponent;
BYTE ComponentCount;
......@@ -808,8 +809,9 @@ typedef enum D3D10_INPUT_CLASSIFICATION {
D3D10_INPUT_PER_INSTANCE_DATA,
} D3D10_INPUT_CLASSIFICATION;
typedef struct D3D10_INPUT_ELEMENT_DESC {
LPCSTR SemanticName;
typedef struct D3D10_INPUT_ELEMENT_DESC
{
const char *SemanticName;
UINT SemanticIndex;
DXGI_FORMAT Format;
UINT InputSlot;
......
......@@ -33,12 +33,12 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown)
/* ID3D10ShaderReflection1 methods */
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE;
STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE;
STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE;
STDMETHOD(GetResourceBindingDescByName)(THIS_ const char *name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetMovInstructionCount)(THIS_ UINT *count) PURE;
STDMETHOD(GetMovcInstructionCount)(THIS_ UINT *count) PURE;
STDMETHOD(GetConversionInstructionCount)(THIS_ UINT *count) PURE;
......
......@@ -72,7 +72,7 @@ typedef ID3DInclude *LPD3D10INCLUDE;
typedef struct _D3D10_SHADER_INPUT_BIND_DESC
{
LPCSTR Name;
const char *Name;
D3D10_SHADER_INPUT_TYPE Type;
UINT BindPoint;
UINT BindCount;
......@@ -84,7 +84,7 @@ typedef struct _D3D10_SHADER_INPUT_BIND_DESC
typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
{
LPCSTR SemanticName;
const char *SemanticName;
UINT SemanticIndex;
UINT Register;
D3D10_NAME SystemValueType;
......@@ -96,7 +96,7 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
typedef struct _D3D10_SHADER_DESC
{
UINT Version;
LPCSTR Creator;
const char *Creator;
UINT Flags;
UINT ConstantBuffers;
UINT BoundResources;
......@@ -127,7 +127,7 @@ typedef struct _D3D10_SHADER_DESC
typedef struct _D3D10_SHADER_BUFFER_DESC
{
LPCSTR Name;
const char *Name;
D3D10_CBUFFER_TYPE Type;
UINT Variables;
UINT Size;
......@@ -136,7 +136,7 @@ typedef struct _D3D10_SHADER_BUFFER_DESC
typedef struct _D3D10_SHADER_VARIABLE_DESC
{
LPCSTR Name;
const char *Name;
UINT StartOffset;
UINT Size;
UINT uFlags;
......@@ -161,8 +161,8 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionType)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE;
STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionType *, GetMemberTypeByName)(THIS_ const char *name) PURE;
STDMETHOD_(const char *, GetMemberTypeName)(THIS_ UINT index) PURE;
};
#undef INTERFACE
......@@ -183,7 +183,7 @@ DECLARE_INTERFACE(ID3D10ShaderReflectionConstantBuffer)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_BUFFER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByIndex)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ const char *name) PURE;
};
#undef INTERFACE
......@@ -199,7 +199,7 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
/* ID3D10ShaderReflection methods */
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE;
STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ const char *name) PURE;
STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE;
STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE;
......@@ -211,14 +211,14 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
extern "C" {
#endif
HRESULT WINAPI D3D10CompileShader(LPCSTR data, SIZE_T data_size, LPCSTR filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, LPCSTR entrypoint,
LPCSTR profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char *filename,
const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint,
const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages);
HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size,
BOOL color_code, const char *comments, ID3D10Blob **disassembly);
LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device);
const char * WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device);
const char * WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device);
HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector);
HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob);
......
......@@ -21,8 +21,8 @@ import "ocidl.idl";
typedef struct _D3D_SHADER_MACRO
{
LPCSTR Name;
LPCSTR Definition;
const char *Name;
const char *Definition;
} D3D_SHADER_MACRO;
typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment