wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

André Hentschel : winmm: Mark up fallthrough switch case (coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 126fded4a4a1340fc2d729591625a2e295c136e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126fded4a4a1340fc2d729591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:19:08 2012 +0100 winmm: Mark up fallthrough switch case (coverity). --- dlls/winmm/winmm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 890a3f0..aecb9cf 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1406,6 +1406,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm switch (lpMMT->wType) { default: FIXME("Unsupported time type %x\n", lpMMT->wType); + /* fall through */ case TIME_BYTES: case TIME_SAMPLES: lpMMT->wType = TIME_MS;

1 0

André Hentschel : start: Fix mask for creation flags ( coverity).
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 76bc1d76a55f9448a90dfef421dbd39b185ceb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc1d76a55f9448a90dfef42… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 7 23:18:57 2012 +0100 start: Fix mask for creation flags (coverity). --- programs/start/start.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index f3d934e..f1cb26a 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -247,7 +247,7 @@ int wmain (int argc, WCHAR *argv[]) sei.lpDirectory = argv[++i]; } else if (is_option(argv[i], bW)) { - creation_flags &= !CREATE_NEW_CONSOLE; + creation_flags &= ~CREATE_NEW_CONSOLE; } else if (argv[i][0] == '/' && (argv[i][1] == 'i' || argv[i][1] == 'I')) { TRACE("/i is ignored\n"); /* FIXME */

1 0

Sam Edwards : opengl32: Apply correct normals to text rendered with wglUseFontOutlines.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 001726fcbda1765cf9226cf6e98d85f5ea48b282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001726fcbda1765cf9226cf6e… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Wed Nov 7 16:06:09 2012 -0700 opengl32: Apply correct normals to text rendered with wglUseFontOutlines. --- dlls/opengl32/wgl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d8719ad..798a0e5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1215,6 +1215,7 @@ typedef void (WINAPI *_GLUfuncptr)(void); static GLUtesselator * (WINAPI *pgluNewTess)(void); static void (WINAPI *pgluDeleteTess)(GLUtesselator *tess); +static void (WINAPI *pgluTessNormal)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z); static void (WINAPI *pgluTessBeginPolygon)(GLUtesselator *tess, void *polygon_data); static void (WINAPI *pgluTessEndPolygon)(GLUtesselator *tess); static void (WINAPI *pgluTessCallback)(GLUtesselator *tess, GLenum which, _GLUfuncptr fn); @@ -1242,6 +1243,7 @@ static HMODULE load_libglu(void) LOAD_FUNCPTR(gluNewTess); LOAD_FUNCPTR(gluDeleteTess); LOAD_FUNCPTR(gluTessBeginContour); + LOAD_FUNCPTR(gluTessNormal); LOAD_FUNCPTR(gluTessBeginPolygon); LOAD_FUNCPTR(gluTessCallback); LOAD_FUNCPTR(gluTessEndContour); @@ -1442,9 +1444,13 @@ static BOOL wglUseFontOutlines_common(HDC hdc, } funcs->gl.p_glNewList(listBase++, GL_COMPILE); - funcs->gl.p_glFrontFace(GL_CW); + funcs->gl.p_glFrontFace(GL_CCW); if(format == WGL_FONT_POLYGONS) + { + funcs->gl.p_glNormal3d(0.0, 0.0, 1.0); + pgluTessNormal(tess, 0, 0, 1); pgluTessBeginPolygon(tess, NULL); + } while(!vertices) {

1 0

Sam Edwards : d3d8/tests: Add test for IDirect3DDevice8_Reset with BackBufferWidth/Height = 0.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 9fb27d7a059600c911471155e0069af318f3122c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb27d7a059600c911471155e… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Wed Nov 7 14:45:46 2012 -0700 d3d8/tests: Add test for IDirect3DDevice8_Reset with BackBufferWidth/Height = 0. --- dlls/d3d8/tests/device.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8cd150f..b98a84a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1018,6 +1018,7 @@ static void test_reset(void) IDirect3D8 *d3d8 = NULL; UINT mode_count = 0; HWND window = NULL; + RECT winrect; D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; @@ -1218,6 +1219,51 @@ static void test_reset(void) surface_desc.Height); IDirect3DSurface8_Release(surface); + winrect.left = 0; + winrect.top = 0; + winrect.right = 200; + winrect.bottom = 150; + ok(AdjustWindowRect(&winrect, WS_OVERLAPPEDWINDOW, FALSE), "AdjustWindowRect failed\n"); + ok(SetWindowPos(window, NULL, 0, 0, + winrect.right-winrect.left, + winrect.bottom-winrect.top, + SWP_NOMOVE|SWP_NOZORDER), + "SetWindowPos failed\n"); + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + d3dpp.BackBufferFormat = d3ddm.Format; + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + + memset(&vp, 0, sizeof(vp)); + hr = IDirect3DDevice8_GetViewport(device1, &vp); + ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); + ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); + todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); + todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); + } + + hr = IDirect3DDevice8_GetRenderTarget(device1, &surface); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", + surface_desc.Width); + todo_wine ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", + surface_desc.Height); + IDirect3DSurface8_Release(surface); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE;

1 0

Dmitry Timoshkov : gdiplus: Store transformation matrix directly in the objects.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 39ec8ce67e92b856f1b8859cf4e4607d7ae0230f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ec8ce67e92b856f1b8859cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 8 11:11:59 2012 +0800 gdiplus: Store transformation matrix directly in the objects. --- dlls/gdiplus/brush.c | 55 +++++++++++++--------------------------- dlls/gdiplus/gdiplus_private.h | 4 +- dlls/gdiplus/graphics.c | 15 +++-------- 3 files changed, 24 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39ec8ce67e92b856f1b88…

1 0

Detlef Riekenberg : mstask/tests: Add tests for SetTargetComputer.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 0c8dc0090b0166ab17cd1b84fdd511cab9086d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8dc0090b0166ab17cd1b84f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 8 00:12:48 2012 +0100 mstask/tests: Add tests for SetTargetComputer. --- dlls/mstask/tests/Makefile.in | 2 +- dlls/mstask/tests/task_scheduler.c | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index ffb66a8..1c0345d 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mstask.dll -IMPORTS = ole32 +IMPORTS = ole32 user32 C_SRCS = \ task.c \ diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 98556be..576d2d60 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -28,6 +28,8 @@ static ITaskScheduler *test_task_scheduler; +static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + static void test_NewWorkItem(void) { HRESULT hres; @@ -134,11 +136,80 @@ static void test_GetTargetComputer(void) return; } +static void test_SetTargetComputer(void) +{ + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + WCHAR *oldname = NULL; + WCHAR *name = NULL; + HRESULT hres; + + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (!GetComputerNameW(buffer + 2, &len)) + return; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler. Skipping tests.\n"); + return; + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok(hres == S_OK, "got 0x%x and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); + + /* NULL is an alias for the local computer */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, NULL); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* The name must be valid */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, does_not_existW); + ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%x (expected 0x80070035)\n", hres); + /* the name of the target computer is unchanged */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* the two backslash are optional */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* the case is ignored */ + CharUpperW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + CharLowerW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* cleanup */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + CoTaskMemFree(oldname); + ITaskScheduler_Release(test_task_scheduler); + return; +} + + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); test_GetTargetComputer(); + test_SetTargetComputer(); CoUninitialize(); }

1 0

Detlef Riekenberg : mstask: Implement SetTargetComputer.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 5bff2fb66b46ab1834354b57baca262861b74e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bff2fb66b46ab1834354b57b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Nov 8 00:12:47 2012 +0100 mstask: Implement SetTargetComputer. --- dlls/mstask/task_scheduler.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 44609b8..5657e43 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -85,8 +85,27 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_SetTargetComputer( ITaskScheduler* iface, LPCWSTR pwszComputer) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszComputer)); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + + TRACE("(%p)->(%s)\n", This, debugstr_w(pwszComputer)); + + /* NULL is an alias for the local computer */ + if (!pwszComputer) + return S_OK; + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + if (!lstrcmpiW(buffer, pwszComputer) || /* full unc name */ + !lstrcmpiW(buffer + 2, pwszComputer)) /* name without backslash */ + return S_OK; + } + + FIXME("remote computer %s not supported\n", debugstr_w(pwszComputer)); + return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); } static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer(

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing ps uniform locations.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 02250bb1bd37a1d5be823684808969eaf9ef413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02250bb1bd37a1d5be8236848… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:16 2012 +0100 wined3d: Introduce a separate function for initializing ps uniform locations. --- dlls/wined3d/glsl_shader.c | 74 +++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e5383b..dc0e328 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4719,6 +4719,40 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "posFixup")); } +static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, + GLhandleARB program_id, struct glsl_ps_program *ps) +{ + unsigned int i; + char name[32]; + + ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, + sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); + for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + { + snprintf(name, sizeof(name), "ps_c[%u]", i); + ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + snprintf(name, sizeof(name), "ps_i[%u]", i); + ps->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_TEXTURES; ++i) + { + snprintf(name, sizeof(name), "bumpenv_mat%u", i); + ps->bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + snprintf(name, sizeof(name), "bumpenv_lum_scale%u", i); + ps->bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + snprintf(name, sizeof(name), "bumpenv_lum_offset%u", i); + ps->bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + ps->np2_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "ps_samplerNP2Fixup")); + ps->ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "ycorrection")); +} + /** Sets the GLSL program ID for the given pixel and vertex shader combination. * It sets the programId on the current StateBlock (because it should be called * inside of the DrawPrimitive() part of the render loop). @@ -4742,7 +4776,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GLhandleARB programId = 0; GLhandleARB reorder_shader_id = 0; unsigned int i; - char glsl_name[10]; struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; GLhandleARB vs_id, ps_id; @@ -4847,44 +4880,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, shader_glsl_validate_link(gl_info, programId); shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - - entry->ps.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, - sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "ps_c[%u]", i); - entry->ps.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - for (i = 0; i < MAX_CONST_I; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "ps_i[%u]", i); - entry->ps.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - - if (pshader) - { - char name[32]; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - sprintf(name, "bumpenv_mat%u", i); - entry->ps.bumpenv_mat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "bumpenv_lum_scale%u", i); - entry->ps.bumpenv_lum_scale_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - sprintf(name, "bumpenv_lum_offset%u", i); - entry->ps.bumpenv_lum_offset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - } - - if (ps_compile_args.np2_fixup) - { - if (entry->ps.np2_fixup_info) - entry->ps.np2_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ps_samplerNP2Fixup")); - else - FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found.\n"); - } - } - - entry->ps.ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing vs uniform locations.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: c9f4cfc96a71f543d573e742551e4b08d5be6aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f4cfc96a71f543d573e7425… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:15 2012 +0100 wined3d: Introduce a separate function for initializing vs uniform locations. --- dlls/wined3d/glsl_shader.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 781105b..7e5383b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4696,6 +4696,29 @@ static GLhandleARB find_glsl_vshader(const struct wined3d_context *context, return ret; } +static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, + GLhandleARB program_id, struct glsl_vs_program *vs) +{ + unsigned int i; + char name[32]; + + vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, + sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); + for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + { + snprintf(name, sizeof(name), "vs_c[%u]", i); + vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + snprintf(name, sizeof(name), "vs_i[%u]", i); + vs->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "posFixup")); +} + /** Sets the GLSL program ID for the given pixel and vertex shader combination. * It sets the programId on the current StateBlock (because it should be called * inside of the DrawPrimitive() part of the render loop). @@ -4823,18 +4846,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - entry->vs.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, - sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "vs_c[%u]", i); - entry->vs.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - for (i = 0; i < MAX_CONST_I; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "vs_i[%u]", i); - entry->vs.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); + entry->ps.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) @@ -4871,7 +4884,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } } - entry->vs.pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ps.ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); checkGLcall("Find glsl program uniform locations");

1 0

Henri Verbeet : wined3d: Use the correct RGTC constant in format_texture_info.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: b42e02ce9b2979763032d600e1518afccbf4df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42e02ce9b2979763032d600e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:14 2012 +0100 wined3d: Use the correct RGTC constant in format_texture_info. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 67cebbe..0624694 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -864,7 +864,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ATI_TEXTURE_COMPRESSION_3DC, NULL}, - {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, 0, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL},

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012