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

wined3d: Only link and use GLSL program if at least one GLSL shader is available.

This commit is contained in:
Ivan Gyurdiev 2006-07-07 00:17:58 -06:00 committed by Alexandre Julliard
parent ea0a102d55
commit fc2611d4a8
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/device.c
View File

@ -282,12 +282,6 @@ void set_glsl_shader_program(IWineD3DDevice *iface) {
struct list *ptr = NULL;
GLhandleARB programId = 0;
if (NULL == vshader && NULL == pshader) {
/* No pixel or vertex shader specified */
This->stateBlock->shaderPrgId = 0;
return;
}
ptr = list_head( &This->glsl_shader_progs );
while (ptr) {
/* At least one program exists - see if it matches our ps/vs combination */

15
dlls/wined3d/drawprim.c
View File

@ -1926,13 +1926,18 @@ inline static void drawPrimitiveDrawStrided(
useDrawStridedSlow = TRUE;
}
/* Bind the correct GLSL shader program based on the currently set vertex & pixel shaders. */
if (wined3d_settings.vs_selected_mode == SHADER_GLSL ||
/* If GLSL is used for either pixel or vertex shaders, make a GLSL program
* Otherwise set 0, which restores fixed function */
if ((wined3d_settings.vs_selected_mode == SHADER_GLSL && useVertexShaderFunction) ||
(wined3d_settings.ps_selected_mode == SHADER_GLSL && usePixelShaderFunction))
set_glsl_shader_program(iface);
else
This->stateBlock->shaderPrgId = 0;
/* If GLSL is used now, or might have been used before, (re)set the program */
if (wined3d_settings.vs_selected_mode == SHADER_GLSL ||
wined3d_settings.ps_selected_mode == SHADER_GLSL) {
set_glsl_shader_program(iface);
/* Start using this program ID (if it's 0, there is no shader program to use, so
* glUseProgramObjectARB(0) will disable the use of any shaders) */
if (This->stateBlock->shaderPrgId)
TRACE_(d3d_shader)("Using GLSL program %u\n", This->stateBlock->shaderPrgId);
GL_EXTCALL(glUseProgramObjectARB(This->stateBlock->shaderPrgId));