November 2007 - Wine-commits

Stefan Dösinger : d3d9: Release the window after the visual tests.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: b4b10d8bc2d6c7a9191898d3a03420bdcae9c6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b10d8bc2d6c7a9191898d3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 20:05:49 2007 +0100 d3d9: Release the window after the visual tests. --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2214783..5886fb8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4426,5 +4426,13 @@ START_TEST(visual) else skip("No ps_1_1 support\n"); cleanup: - if(device_ptr) IDirect3DDevice9_Release(device_ptr); + if(device_ptr) { + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DSwapChain9 *swapchain; + IDirect3DDevice9_GetSwapChain(device_ptr, 0, &swapchain); + IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters); + IDirect3DSwapChain9_Release(swapchain); + IDirect3DDevice9_Release(device_ptr); + DestroyWindow(present_parameters.hDeviceWindow); + } }

1 0

Stefan Leichter : browseui: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: d4e37265f8964772184b7c6df4a3457cd1ffaa40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e37265f8964772184b7c6df… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Nov 8 23:10:22 2007 +0100 browseui: Print 64bit integers with wine_dbgstr_longlong. --- dlls/browseui/progressdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 697d114..63f51dd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -407,7 +407,7 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG ProgressDialog *This = (ProgressDialog *)iface; HWND hwnd; - TRACE("(%p, %llu, %llu)\n", This, ullCompleted, ullTotal); + TRACE("(%p, 0x%s, 0x%s)\n", This, wine_dbgstr_longlong(ullCompleted), wine_dbgstr_longlong(ullTotal)); EnterCriticalSection(&This->cs); This->ullTotal = ullTotal;

1 0

Roderick Colenbrander : wined3d: Make sure SFLAG_LOCKED is set at the start of LockRect as various functions called from LockRect depend on it (e.g. LoadTexture if called from LoadLocation).
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: b238e39ec86bfa14a2d996d30c5084e96464c14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b238e39ec86bfa14a2d996d30… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Nov 8 22:44:34 2007 +0100 wined3d: Make sure SFLAG_LOCKED is set at the start of LockRect as various functions called from LockRect depend on it (e.g. LoadTexture if called from LoadLocation). --- dlls/wined3d/surface.c | 6 ++++++ dlls/wined3d/surface_base.c | 17 ----------------- dlls/wined3d/surface_gdi.c | 9 +++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1ee7b6f..d3cbc52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -799,6 +799,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } + This->Flags |= SFLAG_LOCKED; + + if (!(This->Flags & SFLAG_LOCKABLE)) + { + TRACE("Warning: trying to lock unlockable surf@%p\n", This); + } if (Flags & WINED3DLOCK_DISCARD) { /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 6b9c631..11a3d0b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1573,22 +1573,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - /* Already locked? */ - if(This->Flags & SFLAG_LOCKED) - { - ERR("(%p) Surface already locked\n", This); - /* What should I return here? */ - return WINED3DERR_INVALIDCALL; - } - - if (!(This->Flags & SFLAG_LOCKABLE)) - { - /* This is some GL specific thing, see the OpenGL version of - * this method, but check for the flag and write a trace - */ - TRACE("Warning: trying to lock unlockable surf@%p\n", This); - } - TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); @@ -1642,6 +1626,5 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL /* No dirtifying is needed for this surface implementation */ TRACE("returning memory@%p, pitch(%d)\n", pLockedRect->pBits, pLockedRect->Pitch); - This->Flags |= SFLAG_LOCKED; return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a5ca3db..03852f8 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -205,6 +205,15 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSurface *iface, { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + /* Already locked? */ + if(This->Flags & SFLAG_LOCKED) + { + ERR("(%p) Surface already locked\n", This); + /* What should I return here? */ + return WINED3DERR_INVALIDCALL; + } + This->Flags |= SFLAG_LOCKED; + if(!This->resource.allocatedMemory) { /* This happens on gdi surfaces if the application set a user pointer and resets it. * Recreate the DIB section

1 0

Stefan Dösinger : wined3d: Store the special uniforms' locations in the linked program.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: bfec6c352d8b9421c59299ebcb388a99dc000e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfec6c352d8b9421c59299ebc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 23:05:38 2007 +0100 wined3d: Store the special uniforms' locations in the linked program. --- dlls/wined3d/glsl_shader.c | 45 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 7 ++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dfcccd..22e3dd0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -353,19 +353,18 @@ void shader_glsl_load_constants( GLhandleARB *constant_locations; struct list *constant_list; GLhandleARB programId; - GLint pos; + struct glsl_shader_prog_link *prog = stateBlock->glsl_program; - if (!stateBlock->glsl_program) { + if (!prog) { /* No GLSL program set - nothing to do. */ return; } - programId = stateBlock->glsl_program->programId; + programId = prog->programId; if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; - GLint pos; - constant_locations = stateBlock->glsl_program->vuniformF_locations; + constant_locations = prog->vuniformF_locations; constant_list = &stateBlock->set_vconstantsF; /* Load vertex shader samplers */ @@ -386,9 +385,7 @@ void shader_glsl_load_constants( stateBlock->changed.vertexShaderConstantsB); /* Upload the position fixup params */ - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform4fvARB(pos, 1, &deviceImpl->posFixup[0])); + GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &deviceImpl->posFixup[0])); checkGLcall("glUniform4fvARB"); } @@ -421,9 +418,7 @@ void shader_glsl_load_constants( */ if(((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat != -1) { float *data = (float *) &stateBlock->textureState[(int) ((IWineD3DPixelShaderImpl *) pshader)->needsbumpmat][WINED3DTSS_BUMPENVMAT00]; - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniformMatrix2fvARB(pos, 1, 0, data)); + GL_EXTCALL(glUniformMatrix2fvARB(prog->bumpenvmat_location, 1, 0, data)); checkGLcall("glUniformMatrix2fvARB"); /* texbeml needs the luminance scale and offset too. If texbeml is used, needsbumpmat @@ -434,13 +429,9 @@ void shader_glsl_load_constants( GLfloat *scale = (GLfloat *) &stateBlock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]; GLfloat *offset = (GLfloat *) &stateBlock->textureState[stage][WINED3DTSS_BUMPENVLOFFSET]; - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "luminancescale")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform1fvARB(pos, 1, scale)); + GL_EXTCALL(glUniform1fvARB(prog->luminancescale_location, 1, scale)); checkGLcall("glUniform1fvARB"); - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "luminanceoffset")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform1fvARB(pos, 1, offset)); + GL_EXTCALL(glUniform1fvARB(prog->luminanceoffset_location, 1, offset)); checkGLcall("glUniform1fvARB"); } } else if(((IWineD3DPixelShaderImpl *) pshader)->srgb_enabled && @@ -462,17 +453,11 @@ void shader_glsl_load_constants( mul_low[2] = 1.0; mul_low[3] = 1.0; } - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_comparison")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform4fvARB(pos, 1, comparison)); - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_mul_low")); - checkGLcall("glGetUniformLocationARB"); - GL_EXTCALL(glUniform4fvARB(pos, 1, mul_low)); + GL_EXTCALL(glUniform4fvARB(prog->srgb_comparison_location, 1, comparison)); + GL_EXTCALL(glUniform4fvARB(prog->srgb_mul_low_location, 1, mul_low)); } if(((IWineD3DPixelShaderImpl *) pshader)->vpos_uniform) { float correction_params[4]; - pos = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); - checkGLcall("glGetUniformLocationARB"); if(deviceImpl->render_offscreen) { correction_params[0] = 0.0; correction_params[1] = 1.0; @@ -481,7 +466,7 @@ void shader_glsl_load_constants( correction_params[0] = ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; correction_params[1] = -1.0; } - GL_EXTCALL(glUniform4fvARB(pos, 1, correction_params)); + GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); } } } @@ -3056,6 +3041,14 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i); entry->puniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } + + entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); + entry->bumpenvmat_location = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); + entry->luminancescale_location = GL_EXTCALL(glGetUniformLocationARB(programId, "luminancescale")); + entry->luminanceoffset_location = GL_EXTCALL(glGetUniformLocationARB(programId, "luminanceoffset")); + entry->srgb_comparison_location = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_comparison")); + entry->srgb_mul_low_location = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_mul_low")); + entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); } static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index baa9152..8bff54d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1611,6 +1611,13 @@ struct glsl_shader_prog_link { GLhandleARB programId; GLhandleARB *vuniformF_locations; GLhandleARB *puniformF_locations; + GLhandleARB posFixup_location; + GLhandleARB bumpenvmat_location; + GLhandleARB luminancescale_location; + GLhandleARB luminanceoffset_location; + GLhandleARB srgb_comparison_location; + GLhandleARB srgb_mul_low_location; + GLhandleARB ycorrection_location; GLhandleARB vshader; GLhandleARB pshader; };

1 0

Stefan Dösinger : wined3d: Store integer uniform locations.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 6fd4f8f6990426f9cb954f91420602ec33971738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd4f8f6990426f9cb954f914… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 23:36:10 2007 +0100 wined3d: Store integer uniform locations. --- dlls/wined3d/glsl_shader.c | 44 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 22e3dd0..ee94037 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -230,15 +230,12 @@ static void shader_glsl_load_constantsI( IWineD3DBaseShaderImpl* This, WineD3D_GL_Info *gl_info, GLhandleARB programId, + GLhandleARB locations[MAX_CONST_I], unsigned max_constants, int* constants, BOOL* constants_set) { - GLhandleARB tmp_loc; int i; - char tmp_name[8]; - char is_pshader = shader_is_pshader_version(This->baseShader.hex_version); - const char* prefix = is_pshader? "PI":"VI"; struct list* ptr; for (i=0; i<max_constants; ++i) { @@ -247,15 +244,9 @@ static void shader_glsl_load_constantsI( TRACE_(d3d_constants)("Loading constants %i: %i, %i, %i, %i\n", i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); - /* TODO: Benchmark and see if it would be beneficial to store the - * locations of the constants to avoid looking up each time */ - snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, i); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4ivARB(tmp_loc, 1, &constants[i*4])); - checkGLcall("glUniform4ivARB"); - } + /* We found this uniform name in the program - go ahead and send the data */ + GL_EXTCALL(glUniform4ivARB(locations[i], 1, &constants[i*4])); + checkGLcall("glUniform4ivARB"); } } @@ -269,13 +260,9 @@ static void shader_glsl_load_constantsI( TRACE_(d3d_constants)("Loading local constants %i: %i, %i, %i, %i\n", idx, values[0], values[1], values[2], values[3]); - snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4ivARB(tmp_loc, 1, values)); - checkGLcall("glUniform4ivARB"); - } + /* We found this uniform name in the program - go ahead and send the data */ + GL_EXTCALL(glUniform4ivARB(locations[idx], 1, values)); + checkGLcall("glUniform4ivARB"); ptr = list_next(&This->baseShader.constantsI, ptr); } } @@ -375,7 +362,8 @@ void shader_glsl_load_constants( stateBlock->vertexShaderConstantF, constant_locations, constant_list); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - shader_glsl_load_constantsI(vshader, gl_info, programId, MAX_CONST_I, + shader_glsl_load_constantsI(vshader, gl_info, programId, + prog->vuniformI_locations, MAX_CONST_I, stateBlock->vertexShaderConstantI, stateBlock->changed.vertexShaderConstantsI); @@ -393,7 +381,7 @@ void shader_glsl_load_constants( IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; - constant_locations = stateBlock->glsl_program->puniformF_locations; + constant_locations = prog->puniformF_locations; constant_list = &stateBlock->set_pconstantsF; /* Load pixel shader samplers */ @@ -404,7 +392,8 @@ void shader_glsl_load_constants( stateBlock->pixelShaderConstantF, constant_locations, constant_list); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - shader_glsl_load_constantsI(pshader, gl_info, programId, MAX_CONST_I, + shader_glsl_load_constantsI(pshader, gl_info, programId, + prog->puniformI_locations, MAX_CONST_I, stateBlock->pixelShaderConstantI, stateBlock->changed.pixelShaderConstantsI); @@ -3036,11 +3025,19 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use snprintf(glsl_name, sizeof(glsl_name), "VC[%i]", i); entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } + for (i = 0; i < MAX_CONST_I; ++i) { + snprintf(glsl_name, sizeof(glsl_name), "VI[%i]", i); + entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + } entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(pshader_constantsF)); for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) { snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i); entry->puniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } + for (i = 0; i < MAX_CONST_I; ++i) { + snprintf(glsl_name, sizeof(glsl_name), "PI[%i]", i); + entry->puniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + } entry->posFixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->bumpenvmat_location = GL_EXTCALL(glGetUniformLocationARB(programId, "bumpenvmat")); @@ -3049,6 +3046,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->srgb_comparison_location = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_comparison")); entry->srgb_mul_low_location = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_mul_low")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); + checkGLcall("Find glsl program uniform locations"); } static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8bff54d..4100ad9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1611,6 +1611,8 @@ struct glsl_shader_prog_link { GLhandleARB programId; GLhandleARB *vuniformF_locations; GLhandleARB *puniformF_locations; + GLhandleARB vuniformI_locations[MAX_CONST_I]; + GLhandleARB puniformI_locations[MAX_CONST_I]; GLhandleARB posFixup_location; GLhandleARB bumpenvmat_location; GLhandleARB luminancescale_location;

1 0

Stefan Dösinger : wined3d: Load GLSL sampler uniforms at shader link time.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 9fb70b99db4f9a6eb0a585243666751ad1209137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb70b99db4f9a6eb0a585243… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 7 23:03:15 2007 +0100 wined3d: Load GLSL sampler uniforms at shader link time. --- dlls/wined3d/directx.c | 23 +++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aff5bee..5401ff5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -738,6 +738,29 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->max_vertex_samplers = tmp; glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &tmp); gl_info->max_combined_samplers = tmp; + + /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup + * is known at shader link time. In a vertex shader + pixel shader combination this isn't + * an issue because then the sampler setup only depends on the two shaders. If a pixel + * shader is used with fixed function vertex processing we're fine too because fixed function + * vertex processing doesn't use any samplers. If fixed function fragment processing is + * used we have to make sure that all vertex sampler setups are valid together with all + * possible fixed function fragment processing setups. This is true if vsamplers + MAX_TEXTURES + * <= max_samplers. This is true on all d3d9 cards that support vtf(gf 6 and gf7 cards). + * dx9 radeon cards do not support vertex texture fetch. DX10 cards have 128 samplers, and + * dx9 is limited to 8 fixed function texture stages and 4 vertex samplers. DX10 does not have + * a fixed function pipeline anymore. + * + * So this is just a check to check that our assumption holds true. If not, write a warning + * and reduce the number of vertex samplers or propably disable vertex texture fetch. + */ + if(gl_info->max_vertex_samplers && + MAX_TEXTURES + gl_info->max_vertex_samplers > gl_info->max_combined_samplers) { + FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers\n", + gl_info->max_vertex_samplers, gl_info->max_combined_samplers); + FIXME("Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers\n"); + gl_info->max_vertex_samplers = max(0, gl_info->max_combined_samplers - MAX_TEXTURES); + } } else { gl_info->max_combined_samplers = gl_info->max_fragment_samplers; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ee94037..adfaa9f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -77,10 +77,10 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { */ static void shader_glsl_load_psamplers( WineD3D_GL_Info *gl_info, - IWineD3DStateBlock* iface) { + IWineD3DStateBlock* iface, + GLhandleARB programId) { IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; - GLhandleARB programId = stateBlock->glsl_program->programId; GLhandleARB name_loc; int i; char sampler_name[20]; @@ -101,9 +101,8 @@ static void shader_glsl_load_psamplers( } } -static void shader_glsl_load_vsamplers(WineD3D_GL_Info *gl_info, IWineD3DStateBlock* iface) { +static void shader_glsl_load_vsamplers(WineD3D_GL_Info *gl_info, IWineD3DStateBlock* iface, GLhandleARB programId) { IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; - GLhandleARB programId = stateBlock->glsl_program->programId; GLhandleARB name_loc; char sampler_name[20]; int i; @@ -354,9 +353,6 @@ void shader_glsl_load_constants( constant_locations = prog->vuniformF_locations; constant_list = &stateBlock->set_vconstantsF; - /* Load vertex shader samplers */ - shader_glsl_load_vsamplers(gl_info, (IWineD3DStateBlock*)stateBlock); - /* Load DirectX 9 float constants/uniforms for vertex shader */ shader_glsl_load_constantsF(vshader, gl_info, GL_LIMITS(vshader_constantsF), stateBlock->vertexShaderConstantF, constant_locations, constant_list); @@ -384,9 +380,6 @@ void shader_glsl_load_constants( constant_locations = prog->puniformF_locations; constant_list = &stateBlock->set_pconstantsF; - /* Load pixel shader samplers */ - shader_glsl_load_psamplers(gl_info, (IWineD3DStateBlock*) stateBlock); - /* Load DirectX 9 float constants/uniforms for pixel shader */ shader_glsl_load_constantsF(pshader, gl_info, GL_LIMITS(pshader_constantsF), stateBlock->pixelShaderConstantF, constant_locations, constant_list); @@ -3047,6 +3040,27 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->srgb_mul_low_location = GL_EXTCALL(glGetUniformLocationARB(programId, "srgb_mul_low")); entry->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); checkGLcall("Find glsl program uniform locations"); + + /* Set the shader to allow uniform loading on it */ + GL_EXTCALL(glUseProgramObjectARB(programId)); + checkGLcall("glUseProgramObjectARB(programId)"); + + /* Load the vertex and pixel samplers now. The function that finds the mappings makes sure + * that it stays the same for each vertexshader-pixelshader pair(=linked glsl program). If + * a pshader with fixed function pipeline is used there are no vertex samplers, and if a + * vertex shader with fixed function pixel processing is used we make sure that the card + * supports enough samplers to allow the max number of vertex samplers with all possible + * fixed function fragment processing setups. So once the program is linked these samplers + * won't change. + */ + if(vshader_id) { + /* Load vertex shader samplers */ + shader_glsl_load_vsamplers(gl_info, (IWineD3DStateBlock*)This->stateBlock, programId); + } + if(pshader_id) { + /* Load pixel shader samplers */ + shader_glsl_load_psamplers(gl_info, (IWineD3DStateBlock*)This->stateBlock, programId); + } } static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) {

1 0

Stefan Dösinger : wined3d: Reinstall the projected texture disabling for generated coords.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: d050b4de9ea7100c9b4bccaef8c423ed5260a4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d050b4de9ea7100c9b4bccaef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 7 23:10:33 2007 +0100 wined3d: Reinstall the projected texture disabling for generated coords. --- dlls/wined3d/utils.c | 62 +++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd1d7d3..e108fca 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2500,37 +2500,39 @@ void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, B mat[2] = mat[6] = mat[10] = mat[14] = 0; break; } - } else if(!calculatedCoords) { /* under directx the R/Z coord can be used for translation, under opengl we use the Q coord instead */ - switch(coordtype) { - case WINED3DDECLTYPE_FLOAT1: - /* Direct3D passes the default 1.0 in the 2nd coord, while gl passes it in the 4th. - * swap 2nd and 4th coord. No need to store the value of mat[12] in mat[4] because - * the input value to the transformation will be 0, so the matrix value is irrelevant - */ - mat[12] = mat[4]; - mat[13] = mat[5]; - mat[14] = mat[6]; - mat[15] = mat[7]; - break; - case WINED3DDECLTYPE_FLOAT2: - /* See above, just 3rd and 4th coord - */ - mat[12] = mat[8]; - mat[13] = mat[9]; - mat[14] = mat[10]; - mat[15] = mat[11]; - break; - case WINED3DDECLTYPE_FLOAT3: /* Opengl defaults match dx defaults */ - case WINED3DDECLTYPE_FLOAT4: /* No defaults apply, all app defined */ + } else { /* under directx the R/Z coord can be used for translation, under opengl we use the Q coord instead */ + if(!calculatedCoords) { + switch(coordtype) { + case WINED3DDECLTYPE_FLOAT1: + /* Direct3D passes the default 1.0 in the 2nd coord, while gl passes it in the 4th. + * swap 2nd and 4th coord. No need to store the value of mat[12] in mat[4] because + * the input value to the transformation will be 0, so the matrix value is irrelevant + */ + mat[12] = mat[4]; + mat[13] = mat[5]; + mat[14] = mat[6]; + mat[15] = mat[7]; + break; + case WINED3DDECLTYPE_FLOAT2: + /* See above, just 3rd and 4th coord + */ + mat[12] = mat[8]; + mat[13] = mat[9]; + mat[14] = mat[10]; + mat[15] = mat[11]; + break; + case WINED3DDECLTYPE_FLOAT3: /* Opengl defaults match dx defaults */ + case WINED3DDECLTYPE_FLOAT4: /* No defaults apply, all app defined */ - /* This is to prevent swaping the matrix lines and put the default 4th coord = 1.0 - * into a bad place. The division elimination below will apply to make sure the - * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 - */ - case WINED3DDECLTYPE_UNUSED: /* No texture coords, 0/0/0/1 defaults are passed */ - break; - default: - FIXME("Unexpected fixed function texture coord input\n"); + /* This is to prevent swaping the matrix lines and put the default 4th coord = 1.0 + * into a bad place. The division elimination below will apply to make sure the + * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 + */ + case WINED3DDECLTYPE_UNUSED: /* No texture coords, 0/0/0/1 defaults are passed */ + break; + default: + FIXME("Unexpected fixed function texture coord input\n"); + } } switch (flags & ~WINED3DTTFF_PROJECTED) { /* case WINED3DTTFF_COUNT1: Won't ever get here */

1 0

Paul Vriens : dsound/tests: Fix test failures on WinXP and 2003.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 8454cb17a8be07a4e03706bb406576004f3684f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8454cb17a8be07a4e03706bb4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Nov 8 21:45:14 2007 +0100 dsound/tests: Fix test failures on WinXP and 2003. --- dlls/dsound/tests/ds3d.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index bba6c36..e20dc21 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -349,18 +349,21 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, dsbcaps.dwBufferBytes); } - /* Query the format size. Note that it may not match sizeof(wfx) */ + /* Query the format size. */ size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " "returned the needed size: rc=%s size=%d\n",DXGetErrorString8(rc),size); - rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - if (wfx.wFormatTag == WAVE_FORMAT_EXTENSIBLE) - { + ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), + "Expected a correct structure size, got %d\n", size); + + if (size == sizeof(WAVEFORMATEX)) { + rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); + } + else if (size == sizeof(WAVEFORMATEXTENSIBLE)) { WAVEFORMATEXTENSIBLE wfxe; - ok(rc == DSERR_INVALIDPARAM, "IDirectSoundBuffer_GetFormat returned: %s\n", DXGetErrorString8(rc)); - rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,sizeof(wfxe),NULL); + rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; } ok(rc==DS_OK,

1 0

Stefan Dösinger : wined3d: Implement a detection for the MacOS OpenGL implementation.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: f79ca75d082bbe7fa2e132da7576717312d4f0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79ca75d082bbe7fa2e132da7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 8 22:08:08 2007 +0100 wined3d: Implement a detection for the MacOS OpenGL implementation. --- dlls/wined3d/directx.c | 32 ++++++++++++++++++++++++++++++++ include/wine/wined3d_gl.h | 17 +++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cff6550..65a5b2a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -44,6 +44,8 @@ static const struct { /* APPLE */ {"GL_APPLE_client_storage", APPLE_CLIENT_STORAGE}, {"GL_APPLE_fence", APPLE_FENCE}, + {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER}, + {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422}, /* ATI */ {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL}, @@ -2715,6 +2717,33 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { return IUnknown_Release(volumeParent); } +static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { + /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from + * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to + * detect the Apple OpenGL implementation to apply some extension fixups afterwards. + * + * Detecting this isn't really easy. The vendor string doesn't mention Apple. Compile-time checks + * aren't sufficient either because a Linux binary may display on a macos X server via remote X11. + * So try to detect the GL implementation by looking at certain Apple extensions. Some extensions + * like client storage might be supported on other implementations too, but GL_APPLE_flush_render + * is specific to the MacOS window management, and GL_APPLE_ycbcr_422 is a Quicktime specific, so + * it the chance that other implementations support it is rather rare since Win32 Quicktime uses + * DirectDraw, not OpenGL. + */ + if(gl_info->supported[APPLE_FENCE] && + gl_info->supported[APPLE_CLIENT_STORAGE] && + gl_info->supported[APPLE_FLUSH_RENDER] && + gl_info->supported[APPLE_YCBCR_422]) { + TRACE_(d3d_caps)("GL_APPLE_fence, GL_APPLE_client_storage, GL_APPLE_flush_render and GL_ycbcr_422 are supported\n"); + TRACE_(d3d_caps)("Activating MacOS fixups\n"); + return TRUE; + } else { + TRACE_(d3d_caps)("Apple extensions are not supported\n"); + TRACE_(d3d_caps)("Not activating MacOS fixups\n"); + return FALSE; + } +} + #define PUSH1(att) attribs[nAttribs++] = (att); #define GLINFO_LOCATION (Adapters[0].gl_info) BOOL InitAdapters(void) { @@ -2769,6 +2798,7 @@ BOOL InitAdapters(void) { int attribute; DISPLAY_DEVICEW DisplayDevice; HDC hdc; + BOOL apple; TRACE("Initializing default adapter\n"); Adapters[0].monitorPoint.x = -1; @@ -2853,6 +2883,8 @@ BOOL InitAdapters(void) { } WineD3D_ReleaseFakeGLContext(); + apple = implementation_is_apple(&Adapters[0].gl_info); + select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1c316e9..254826e 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2854,6 +2854,18 @@ typedef int (WINE_GLAPI * PGLXFNWAITVIDEOSYNCSGIPROC) (int, int, unsigned int *) #define GL_DEPTH_CLAMP_NV 0x864F #endif +/* GL_APPLE_flush_render */ +typedef void (WINE_GLAPI * PGLFNFLUSHRENDERAPPLEPROC) (void); +typedef void (WINE_GLAPI * PGLFNFINISHRENDERAPPLEPROC) (void); + +/* GL_APPLE_ycbcr_422 */ +#ifndef GL_APPLE_ycbcr_422 +#define GL_APPLE_ycbcr_422 +#define GL_YCBCR_422_APPLE 0x85B9 +#define UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3206,6 +3218,8 @@ typedef enum _GL_SupportedExt { /* APPLE */ APPLE_FENCE, APPLE_CLIENT_STORAGE, + APPLE_FLUSH_RENDER, + APPLE_YCBCR_422, /* SGI */ SGI_VIDEO_SYNC, SGIS_GENERATE_MIPMAP, @@ -3488,6 +3502,9 @@ typedef enum _GL_SupportedExt { /* GLX_SGI_video_sync */ \ USE_GL_FUNC(PGLXFNGETVIDEOSYNCSGIPROC, glXGetVideoSyncSGI); \ USE_GL_FUNC(PGLXFNWAITVIDEOSYNCSGIPROC, glXWaitVideoSyncSGI); \ + /* GL_APPLE_flush_render */ \ + USE_GL_FUNC(PGLFNFLUSHRENDERAPPLEPROC, glFlushRenderApple); \ + USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

Stefan Dösinger : wined3d: Fix for MacOS' es incomplete glsl uniform truth.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 883915fc728b2915a8f4871b4f488251c5679dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=883915fc728b2915a8f4871b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 8 22:10:17 2007 +0100 wined3d: Fix for MacOS'es incomplete glsl uniform truth. --- dlls/wined3d/directx.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 65a5b2a..dc2462e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2744,6 +2744,25 @@ static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { } } +static void fixup_extensions(WineD3D_GL_Info *gl_info) { + if(implementation_is_apple(gl_info)) { + /* MacOS advertises more GLSL vertex shader uniforms than support on hardware, and if more are + * used it falls back to software. While the compiler can detect if the shader uses all declared + * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader + * using relative addressing falls back to software. + * + * ARB vp gives the correct amount of uniforms, so use it instead of GLSL + */ + if(gl_info->vs_glsl_constantsF <= gl_info->vs_arb_constantsF) { + FIXME("GLSL doesn't advertise more vertex shader uniforms than ARB. Driver fixup outdated?\n"); + } else { + TRACE("Driver claims %u GLSL vs uniforms, replacing with %u ARB vp uniforms\n", + gl_info->vs_glsl_constantsF, gl_info->vs_arb_constantsF); + gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; + } + } +} + #define PUSH1(att) attribs[nAttribs++] = (att); #define GLINFO_LOCATION (Adapters[0].gl_info) BOOL InitAdapters(void) { @@ -2798,7 +2817,6 @@ BOOL InitAdapters(void) { int attribute; DISPLAY_DEVICEW DisplayDevice; HDC hdc; - BOOL apple; TRACE("Initializing default adapter\n"); Adapters[0].monitorPoint.x = -1; @@ -2883,7 +2901,7 @@ BOOL InitAdapters(void) { } WineD3D_ReleaseFakeGLContext(); - apple = implementation_is_apple(&Adapters[0].gl_info); + fixup_extensions(&Adapters[0].gl_info); select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info);

1 0