[PATCH] WineD3D: Get rid of =
Stefan Doesinger
stefan at codeweavers.com
Mon Dec 15 19:24:36 CST 2008
IWineD3DPixelShaderImpl_GenerateShader=0A=
=0A=
---=0A=
dlls/wined3d/pixelshader.c | 19 ++++---------------=0A=
1 files changed, 4 insertions(+), 15 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c=0A=
index 5857ce7..af3c59d 100644=0A=
--- a/dlls/wined3d/pixelshader.c=0A=
+++ b/dlls/wined3d/pixelshader.c=0A=
@@ -298,20 +298,6 @@ static void pshader_set_limits(=0A=
}=0A=
}=0A=
=0A=
-/** Generate a pixel shader string using either GL_FRAGMENT_PROGRAM_ARB=0A=
- or GLSL and send it to the card */=0A=
-static inline GLuint IWineD3DPixelShaderImpl_GenerateShader(=0A=
- IWineD3DPixelShaderImpl *This) {=0A=
- SHADER_BUFFER buffer;=0A=
- GLuint shader;=0A=
-=0A=
- shader_buffer_init(&buffer);=0A=
- shader =3D ((IWineD3DDeviceImpl =
*)This->baseShader.device)->shader_backend->shader_generate_pshader((IWin=
eD3DPixelShader *)This, &buffer);=0A=
- shader_buffer_free(&buffer);=0A=
-=0A=
- return shader;=0A=
-}=0A=
-=0A=
static HRESULT WINAPI =
IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST =
DWORD *pFunction) {=0A=
=0A=
IWineD3DPixelShaderImpl *This =3D(IWineD3DPixelShaderImpl *)iface;=0A=
@@ -444,6 +430,7 @@ static GLuint =
pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps=0A=
{=0A=
CONST DWORD *function =3D This->baseShader.function;=0A=
GLuint retval;=0A=
+ SHADER_BUFFER buffer;=0A=
=0A=
TRACE("(%p) : function %p\n", This, function);=0A=
=0A=
@@ -455,7 +442,9 @@ static GLuint =
pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps=0A=
=0A=
/* Generate the HW shader */=0A=
TRACE("(%p) : Generating hardware program\n", This);=0A=
- retval =3D IWineD3DPixelShaderImpl_GenerateShader(This);=0A=
+ shader_buffer_init(&buffer);=0A=
+ retval =3D ((IWineD3DDeviceImpl =
*)This->baseShader.device)->shader_backend->shader_generate_pshader((IWin=
eD3DPixelShader *)This, &buffer);=0A=
+ shader_buffer_free(&buffer);=0A=
=0A=
This->baseShader.is_compiled =3D TRUE;=0A=
=0A=
-- =0A=
1.5.6.4=0A=
=0A=
------=_NextPart_000_0061_01C95EEF.318BA5C0--
More information about the wine-patches
mailing list