ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: Add a separate function for d3d10_geometry_shader initialization.

This commit is contained in:
Henri Verbeet 2009-10-29 18:56:22 +01:00 committed by Alexandre Julliard
parent bf10dbe8a6
commit 39d6f64885
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d10core/d3d10core_private.h
View File

@ -145,13 +145,14 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1
const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN;
/* ID3D10GeometryShader */
extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl DECLSPEC_HIDDEN;
struct d3d10_geometry_shader
{
const struct ID3D10GeometryShaderVtbl *vtbl;
LONG refcount;
};
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader);
/* ID3D10PixelShader */
struct d3d10_pixel_shader
{

10
dlls/d3d10core/device.c
View File

@ -965,6 +965,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device
const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader)
{
struct d3d10_geometry_shader *object;
HRESULT hr;
FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n",
iface, byte_code, byte_code_length, shader);
@ -976,9 +977,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device
return E_OUTOFMEMORY;
}
object->vtbl = &d3d10_geometry_shader_vtbl;
object->refcount = 1;
hr = d3d10_geometry_shader_init(object);
if (FAILED(hr))
{
WARN("Failed to initialize geometry shader, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
}
TRACE("Created geometry shader %p.\n", object);
*shader = (ID3D10GeometryShader *)object;
return S_OK;

10
dlls/d3d10core/shader.c
View File

@ -352,7 +352,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(I
return E_NOTIMPL;
}
const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =
static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =
{
/* IUnknown methods */
d3d10_geometry_shader_QueryInterface,
@ -365,6 +365,14 @@ const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =
d3d10_geometry_shader_SetPrivateDataInterface,
};
HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader)
{
shader->vtbl = &d3d10_geometry_shader_vtbl;
shader->refcount = 1;
return S_OK;
}
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface,