Stefan Dösinger : wined3d: Get rid of IWineD3DPixelShaderImpl_GenerateShader.
Alexandre Julliard
julliard at winehq.org
Tue Dec 16 08:40:57 CST 2008
Module: wine
Branch: master
Commit: 704f9ea5d18cc005b576e1da302cac05463b50f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=704f9ea5d18cc005b576e1da302cac05463b50f2
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Mon Dec 15 19:24:36 2008 +0100
wined3d: Get rid of IWineD3DPixelShaderImpl_GenerateShader.
---
dlls/wined3d/pixelshader.c | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 1dd3888..b6b84b0 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -296,20 +296,6 @@ static void pshader_set_limits(
}
}
-/** Generate a pixel shader string using either GL_FRAGMENT_PROGRAM_ARB
- or GLSL and send it to the card */
-static inline GLuint IWineD3DPixelShaderImpl_GenerateShader(
- IWineD3DPixelShaderImpl *This) {
- SHADER_BUFFER buffer;
- GLuint shader;
-
- shader_buffer_init(&buffer);
- shader = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer);
- shader_buffer_free(&buffer);
-
- return shader;
-}
-
static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) {
IWineD3DPixelShaderImpl *This =(IWineD3DPixelShaderImpl *)iface;
@@ -436,6 +422,7 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps
{
CONST DWORD *function = This->baseShader.function;
GLuint retval;
+ SHADER_BUFFER buffer;
TRACE("(%p) : function %p\n", This, function);
@@ -447,7 +434,9 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps
/* Generate the HW shader */
TRACE("(%p) : Generating hardware program\n", This);
- retval = IWineD3DPixelShaderImpl_GenerateShader(This);
+ shader_buffer_init(&buffer);
+ retval = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer);
+ shader_buffer_free(&buffer);
This->baseShader.is_compiled = TRUE;
More information about the wine-cvs
mailing list