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

wined3d: Select the right shader backend when creating the device.

This commit is contained in:
H. Verbeet 2006-11-27 20:50:43 +01:00 committed by Alexandre Julliard
parent df6f482a69
commit 8a7f427948
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/directx.c
View File

@ -2438,6 +2438,13 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter,
IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); IWineD3DImpl_FillGLCaps(iface, IWineD3DImpl_GetAdapterDisplay(iface, Adapter));
LEAVE_GL(); LEAVE_GL();
select_shader_mode(&This->gl_info, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); select_shader_mode(&This->gl_info, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode);
if (object->ps_selected_mode == SHADER_GLSL || object->vs_selected_mode == SHADER_GLSL) {
object->shader_backend = &glsl_shader_backend;
} else if (object->ps_selected_mode == SHADER_ARB || object->vs_selected_mode == SHADER_ARB) {
object->shader_backend = &arb_program_shader_backend;
} else {
object->shader_backend = &none_shader_backend;
}
/* This function should *not* be modifying GL caps /* This function should *not* be modifying GL caps
* TODO: move the functionality where it belongs */ * TODO: move the functionality where it belongs */

22
dlls/wined3d/drawprim.c
View File

@ -1802,18 +1802,10 @@ inline static void drawPrimitiveDrawStrided(
} }
/* Make any shaders active */ /* Make any shaders active */
if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction);
glsl_shader_backend.shader_select(iface, usePixelShaderFunction, useVertexShaderFunction);
} else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) {
arb_program_shader_backend.shader_select(iface, usePixelShaderFunction, useVertexShaderFunction);
}
/* Load any global constants/uniforms that may have been set by the application */ /* Load any global constants/uniforms that may have been set by the application */
if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { This->shader_backend->shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction);
glsl_shader_backend.shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction);
} else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) {
arb_program_shader_backend.shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction);
}
/* Draw vertex-by-vertex */ /* Draw vertex-by-vertex */
if (useDrawStridedSlow) if (useDrawStridedSlow)
@ -1822,11 +1814,7 @@ inline static void drawPrimitiveDrawStrided(
drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx);
/* Cleanup any shaders */ /* Cleanup any shaders */
if (This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL) { This->shader_backend->shader_cleanup(usePixelShaderFunction, useVertexShaderFunction);
glsl_shader_backend.shader_cleanup(usePixelShaderFunction, useVertexShaderFunction);
} else if (This->vs_selected_mode == SHADER_ARB || This->ps_selected_mode == SHADER_ARB) {
arb_program_shader_backend.shader_cleanup(usePixelShaderFunction, useVertexShaderFunction);
}
/* Unload vertex data */ /* Unload vertex data */
if (useVertexShaderFunction) { if (useVertexShaderFunction) {
@ -2046,7 +2034,6 @@ static void check_fbo_status(IWineD3DDevice *iface) {
static void depth_blt(IWineD3DDevice *iface, GLuint texture) { static void depth_blt(IWineD3DDevice *iface, GLuint texture) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
BOOL glsl_mode = This->vs_selected_mode == SHADER_GLSL || This->ps_selected_mode == SHADER_GLSL;
glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT); glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT);
@ -2061,8 +2048,7 @@ static void depth_blt(IWineD3DDevice *iface, GLuint texture) {
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
if (glsl_mode) glsl_shader_backend.shader_select_depth_blt(iface); This->shader_backend->shader_select_depth_blt(iface);
else arb_program_shader_backend.shader_select_depth_blt(iface);
glBegin(GL_TRIANGLE_STRIP); glBegin(GL_TRIANGLE_STRIP);
glVertex2f(-1.0f, -1.0f); glVertex2f(-1.0f, -1.0f);

1
dlls/wined3d/wined3d_private.h
View File

@ -515,6 +515,7 @@ typedef struct IWineD3DDeviceImpl
/* Selected capabilities */ /* Selected capabilities */
int vs_selected_mode; int vs_selected_mode;
int ps_selected_mode; int ps_selected_mode;
const shader_backend_t *shader_backend;
/* Optimization */ /* Optimization */
BOOL modelview_valid; BOOL modelview_valid;