November 2007 - Wine-Commits

Roderick Colenbrander : wined3d: Rewrite the draw buffer selection code.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: df892ff67d8ae2c0f46b222f219b55029158c391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df892ff67d8ae2c0f46b222f2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Nov 6 01:11:35 2007 +0100 wined3d: Rewrite the draw buffer selection code. Before it was done in findContext, before selecting the new context which is bad (it doesn't always work). The new code works and this change also fixes some draw buffer regressions that happened during the surface rewrite from the last couple of days. --- dlls/wined3d/context.c | 33 +++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index dc64a5c..8311ab5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -674,7 +674,7 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai * Returns: The needed context * *****************************************************************************/ -static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { +static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid, GLint *buffer) { IWineD3DSwapChain *swapchain = NULL; HRESULT hr; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; @@ -693,15 +693,12 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf * rendering. No context change is needed in that case */ - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - if(((IWineD3DSwapChainImpl *) swapchain)->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } else { - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); - } - } else if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { + if(((IWineD3DSwapChainImpl *) swapchain)->frontBuffer == target) { + *buffer = GL_FRONT; + } else { + *buffer = GL_BACK; + } + if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { if(This->pbufferContext && tid == This->pbufferContext->tid) { This->pbufferContext->tid = 0; } @@ -719,6 +716,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } else { TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; + *buffer = This->offscreenBuffer; switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: @@ -784,8 +782,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf */ context = findThreadContextForSwapChain(This->swapchains[0], tid); } - glDrawBuffer(This->offscreenBuffer); - checkGLcall("glDrawBuffer(This->offscreenBuffer)"); break; } @@ -849,11 +845,11 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU DWORD dirtyState, idx; BYTE shift; WineD3DContext *context; + GLint drawBuffer=0; TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - if(This->lastActiveRenderTarget != target || tid != This->lastThread) { - context = FindContext(This, target, tid); + context = FindContext(This, target, tid, &drawBuffer); This->lastActiveRenderTarget = target; This->lastThread = tid; } else { @@ -874,6 +870,15 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ ENTER_GL(); + /* Select the right draw buffer. It is selected in FindContext. */ + if(drawBuffer && context->last_draw_buffer != drawBuffer) { + TRACE("Drawing to buffer: %#x\n", drawBuffer); + context->last_draw_buffer = drawBuffer; + + glDrawBuffer(drawBuffer); + checkGLcall("glDrawBuffer"); + } + switch(usage) { case CTXUSAGE_RESOURCELOAD: /* This does not require any special states to be set up */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e2eec1..89688fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -493,6 +493,7 @@ struct WineD3DContext { DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some inforation about the context state for optimization */ + GLint last_draw_buffer; BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ BOOL last_was_pshader; BOOL last_was_vshader;

1 0

Laurent Vromman : gdi32: Add a test for CloseFigure.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 6f140f9bec8d6d472073ed184c19e73a70d7a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f140f9bec8d6d472073ed184… Author: Laurent Vromman <laurent(a)vromman.org> Date: Mon Nov 5 17:55:17 2007 +0100 gdi32: Add a test for CloseFigure. --- dlls/gdi32/path.c | 3 +-- dlls/gdi32/tests/path.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 683bdba..553f475 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -235,9 +235,8 @@ BOOL WINAPI CloseFigure(HDC hdc) } else { - /* FIXME: Shouldn't we draw a line to the beginning of the - figure? */ /* Set PT_CLOSEFIGURE on the last entry and start a new stroke */ + /* It is not necessary to draw a line, PT_CLOSEFIGURE is a virtual closing line itself */ if(dc->path.numEntriesUsed) { dc->path.pFlags[dc->path.numEntriesUsed-1]|=PT_CLOSEFIGURE; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 33497bc..6753298 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -391,10 +391,41 @@ done: ReleaseDC(0, hdc); } +static void test_closefigure(void) { + BOOL retb; + int nSize, nSizeWitness; + HDC hdc = GetDC(0); + + BeginPath(hdc); + MoveToEx(hdc, 95, 95, NULL); + LineTo(hdc, 95, 0); + LineTo(hdc, 0, 95); + + retb = CloseFigure(hdc); + EndPath(hdc); + nSize = GetPath(hdc, NULL, NULL, 0); + + AbortPath(hdc); + + BeginPath(hdc); + MoveToEx(hdc, 95, 95, NULL); + LineTo(hdc, 95, 0); + LineTo(hdc, 0, 95); + + EndPath(hdc); + nSizeWitness = GetPath(hdc, NULL, NULL, 0); + + /* This test shows CloseFigure does not have to add a point at the end of the path */ + ok(nSize == nSizeWitness, "Wrong number of points, no point should be added by CloseFigure\n"); + + ReleaseDC(0, hdc); +} + START_TEST(path) { test_widenpath(); test_arcto(); test_anglearc(); test_polydraw(); + test_closefigure(); }

1 0

Alexandre Julliard : user32: Fixed A<-> W translations of CREATESTRUCTs that contain atoms.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 2b77fed4cd7cb880d3b97d2ba714f146150de1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b77fed4cd7cb880d3b97d2ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 13:58:05 2007 +0100 user32: Fixed A<->W translations of CREATESTRUCTs that contain atoms. --- dlls/user32/winproc.c | 50 +++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7d6fa36..32b9cb1 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -778,12 +778,12 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, MDICREATESTRUCTW mdi_cs; DWORD name_lenA = 0, name_lenW = 0, class_lenA = 0, class_lenW = 0; - if (HIWORD(csA->lpszClass)) + if (!IS_INTRESOURCE(csA->lpszClass)) { class_lenA = strlen(csA->lpszClass) + 1; RtlMultiByteToUnicodeSize( &class_lenW, csA->lpszClass, class_lenA ); } - if (HIWORD(csA->lpszName)) + if (!IS_INTRESOURCE(csA->lpszName)) { name_lenA = strlen(csA->lpszName) + 1; RtlMultiByteToUnicodeSize( &name_lenW, csA->lpszName, name_lenA ); @@ -825,12 +825,12 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, memcpy( &csW, csA, sizeof(csW) ); - if (HIWORD(csA->szTitle)) + if (!IS_INTRESOURCE(csA->szTitle)) { title_lenA = strlen(csA->szTitle) + 1; RtlMultiByteToUnicodeSize( &title_lenW, csA->szTitle, title_lenA ); } - if (HIWORD(csA->szClass)) + if (!IS_INTRESOURCE(csA->szClass)) { class_lenA = strlen(csA->szClass) + 1; RtlMultiByteToUnicodeSize( &class_lenW, csA->szClass, class_lenA ); @@ -1032,37 +1032,35 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { case WM_NCCREATE: case WM_CREATE: - { /* csW->lpszName and csW->lpszClass are NOT supposed to be atoms - * at this point. - */ - char buffer[1024], *cls, *name; + { + char buffer[1024], *cls; CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam; CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; MDICREATESTRUCTA mdi_cs; - DWORD name_lenA, name_lenW, class_lenA, class_lenW; - - class_lenW = strlenW(csW->lpszClass) * sizeof(WCHAR); - RtlUnicodeToMultiByteSize(&class_lenA, csW->lpszClass, class_lenW); + DWORD name_lenA = 0, name_lenW = 0, class_lenA = 0, class_lenW = 0; - if (csW->lpszName) + if (!IS_INTRESOURCE(csW->lpszClass)) + { + class_lenW = (strlenW(csW->lpszClass) + 1) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize(&class_lenA, csW->lpszClass, class_lenW); + } + if (!IS_INTRESOURCE(csW->lpszName)) { - name_lenW = strlenW(csW->lpszName) * sizeof(WCHAR); + name_lenW = (strlenW(csW->lpszName) + 1) * sizeof(WCHAR); RtlUnicodeToMultiByteSize(&name_lenA, csW->lpszName, name_lenW); } - else - name_lenW = name_lenA = 0; - - if (!(cls = get_buffer( buffer, sizeof(buffer), class_lenA + name_lenA + 2 ))) break; - RtlUnicodeToMultiByteN(cls, class_lenA, NULL, csW->lpszClass, class_lenW); - cls[class_lenA] = 0; - csA.lpszClass = cls; + if (!(cls = get_buffer( buffer, sizeof(buffer), class_lenA + name_lenA ))) break; - if (csW->lpszName) + if (class_lenA) + { + RtlUnicodeToMultiByteN(cls, class_lenA, NULL, csW->lpszClass, class_lenW); + csA.lpszClass = cls; + } + if (name_lenA) { - name = cls + class_lenA + 1; + char *name = cls + class_lenA; RtlUnicodeToMultiByteN(name, name_lenA, NULL, csW->lpszName, name_lenW); - name[name_lenA] = 0; csA.lpszName = name; } @@ -1149,12 +1147,12 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN memcpy( &csA, csW, sizeof(csA) ); - if (HIWORD(csW->szTitle)) + if (!IS_INTRESOURCE(csW->szTitle)) { title_lenW = (strlenW(csW->szTitle) + 1) * sizeof(WCHAR); RtlUnicodeToMultiByteSize( &title_lenA, csW->szTitle, title_lenW ); } - if (HIWORD(csW->szClass)) + if (!IS_INTRESOURCE(csW->szClass)) { class_lenW = (strlenW(csW->szClass) + 1) * sizeof(WCHAR); RtlUnicodeToMultiByteSize( &class_lenA, csW->szClass, class_lenW );

1 0

Roderick Colenbrander : wined3d: Make sure the format of the render target is P8 too.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: b3f7a5565a096dd709800738dfd669cb93d68b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f7a5565a096dd709800738d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Nov 5 20:20:34 2007 +0100 wined3d: Make sure the format of the render target is P8 too. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3d22e42..4aa386f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1407,7 +1407,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if (device->render_targets && device->render_targets[0]) { IWineD3DSurfaceImpl* render_target = (IWineD3DSurfaceImpl*)device->render_targets[0]; - if(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + if((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) && (render_target->resource.format == WINED3DFMT_P8)) p8_render_target = TRUE; }

1 0

Stefan Dösinger : wined3d: Handle ps 3. 0 varyings in a different way.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 3febe738ab34fe9ed23b5818d7e8c2ec77e8399f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3febe738ab34fe9ed23b5818d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 26 02:11:00 2007 +0200 wined3d: Handle ps 3.0 varyings in a different way. --- dlls/wined3d/glsl_shader.c | 376 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/pixelshader.c | 29 +++- dlls/wined3d/vertexshader.c | 7 +- dlls/wined3d/wined3d_private.h | 16 +- 4 files changed, 344 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3febe738ab34fe9ed23b5…

1 0

Stefan Dösinger : wined3d: Add a max varyings member to the gl info structure.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 654571f2fc51f97cc84cb86d5738e216c810f7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=654571f2fc51f97cc84cb86d5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 24 13:16:57 2007 +0200 wined3d: Add a max varyings member to the gl info structure. --- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 55b40e9..a77ea96 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -757,6 +757,9 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); gl_info->ps_glsl_constantsF = gl_max / 4; TRACE_(d3d_caps)("Max ARB_FRAGMENT_SHADER float constants: %u\n", gl_info->ps_glsl_constantsF); + glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); + gl_info->max_glsl_varyings = gl_max; + TRACE_(d3d_caps)("Max GLSL varyings: %u (%u 4 component varyings)\n", gl_max, gl_max / 4); } if (gl_info->supported[EXT_VERTEX_SHADER]) { gl_info->vs_ati_version = VS_VERSION_11; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 5354fef..8694f37 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3723,6 +3723,7 @@ typedef struct _WineD3D_GL_Info { UINT max_blends; UINT max_anisotropy; UINT max_aux_buffers; + UINT max_glsl_varyings; unsigned max_vshader_constantsF; unsigned max_pshader_constantsF;

1 0

Stefan Dösinger : wined3d: Pixel Shader varying indexing.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 0615c8e4545c46fd2405f794a600f8b9f15747c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0615c8e4545c46fd2405f794a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 00:08:56 2007 +0200 wined3d: Pixel Shader varying indexing. --- dlls/wined3d/glsl_shader.c | 58 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2aadbfc..e344bad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -773,9 +773,16 @@ static void shader_glsl_get_register_name( case WINED3DSPR_INPUT: if (pshader) { /* Pixel shaders >= 3.0 */ - if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) - sprintf(tmpStr, "IN[%u]", reg); - else { + if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) { + if (param & WINED3DSHADER_ADDRMODE_RELATIVE) { + glsl_src_param_t rel_param; + shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); + + sprintf(tmpStr, "IN[%s + %u]", rel_param.param_str, reg); + } else { + sprintf(tmpStr, "IN[%u]", reg); + } + } else { if (reg==0) strcpy(tmpStr, "gl_Color"); else @@ -1817,13 +1824,50 @@ void shader_glsl_sincos(SHADER_OPCODE_ARG* arg) { void shader_glsl_loop(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; + DWORD regtype = shader_get_regtype(arg->src[1]); + DWORD reg = arg->src[1] & WINED3DSP_REGNUM_MASK; + const DWORD *control_values = NULL; + local_constant *constant; shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - shader_addline(arg->buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, - src1_param.reg_name, shader->baseShader.cur_loop_depth, src1_param.reg_name, - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, src1_param.reg_name); + /* Try to hardcode the loop control parameters if possible. Direct3D 9 class hardware doesn't support real + * varying indexing, but Microsoft designed this feature for Shader model 2.x+. If the loop control is + * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct + * addressing. + */ + if(regtype == WINED3DSPR_CONSTINT) { + LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { + if(constant->idx == reg) { + control_values = constant->value; + break; + } + } + } + + if(control_values) { + if(control_values[2] > 0) { + shader_addline(arg->buffer, "for (aL%u = %d; aL%u < (%d * %d + %d); aL%u += %d) {\n", + shader->baseShader.cur_loop_depth, control_values[1], + shader->baseShader.cur_loop_depth, control_values[0], control_values[2], control_values[1], + shader->baseShader.cur_loop_depth, control_values[2]); + } else if(control_values[2] == 0) { + shader_addline(arg->buffer, "for (aL%u = %d, tmpInt%u = 0; tmpInt%u < %d; tmpInt%u++) {\n", + shader->baseShader.cur_loop_depth, control_values[1], shader->baseShader.cur_loop_depth, + shader->baseShader.cur_loop_depth, control_values[0], + shader->baseShader.cur_loop_depth); + } else { + shader_addline(arg->buffer, "for (aL%u = %d; aL%u > (%d * %d + %d); aL%u += %d) {\n", + shader->baseShader.cur_loop_depth, control_values[1], + shader->baseShader.cur_loop_depth, control_values[0], control_values[2], control_values[1], + shader->baseShader.cur_loop_depth, control_values[2]); + } + } else { + shader_addline(arg->buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, + src1_param.reg_name, shader->baseShader.cur_loop_depth, src1_param.reg_name, + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_regno, src1_param.reg_name); + } shader->baseShader.cur_loop_depth++; shader->baseShader.cur_loop_regno++;

1 0

Stefan Dösinger : wined3d: Make pixel shader input an array.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 9a9dfc76cbed343635912efde7a4fd35b82c2157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9dfc76cbed343635912efde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 18 14:45:32 2007 +0200 wined3d: Make pixel shader input an array. --- dlls/wined3d/glsl_shader.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e79e27..2aadbfc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -617,9 +617,8 @@ void shader_generate_glsl_declarations( } /* Declare input register temporaries */ - for (i=0; i < This->baseShader.limits.packed_input; i++) { - if (reg_maps->packed_input[i]) - shader_addline(buffer, "vec4 IN%lu;\n", i); + if(pshader) { + shader_addline(buffer, "vec4 IN[%lu];\n", This->baseShader.limits.packed_input); } /* Declare output register temporaries */ @@ -775,7 +774,7 @@ static void shader_glsl_get_register_name( if (pshader) { /* Pixel shaders >= 3.0 */ if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) - sprintf(tmpStr, "IN%u", reg); + sprintf(tmpStr, "IN[%u]", reg); else { if (reg==0) strcpy(tmpStr, "gl_Color"); @@ -2514,28 +2513,28 @@ void pshader_glsl_input_pack( case WINED3DDECLUSAGE_COLOR: if (usage_idx == 0) - shader_addline(buffer, "IN%u%s = vec4(gl_Color)%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", i, reg_mask, reg_mask); else if (usage_idx == 1) - shader_addline(buffer, "IN%u%s = vec4(gl_SecondaryColor)%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", i, reg_mask, reg_mask); else - shader_addline(buffer, "IN%u%s = vec4(unsupported_color_input)%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(unsupported_color_input)%s;\n", i, reg_mask, reg_mask); break; case WINED3DDECLUSAGE_TEXCOORD: - shader_addline(buffer, "IN%u%s = vec4(gl_TexCoord[%u])%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(gl_TexCoord[%u])%s;\n", i, reg_mask, usage_idx, reg_mask ); break; case WINED3DDECLUSAGE_FOG: - shader_addline(buffer, "IN%u%s = vec4(gl_FogFragCoord)%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(gl_FogFragCoord)%s;\n", i, reg_mask, reg_mask); break; default: - shader_addline(buffer, "IN%u%s = vec4(unsupported_input)%s;\n", + shader_addline(buffer, "IN[%u]%s = vec4(unsupported_input)%s;\n", i, reg_mask, reg_mask); } }

1 0

Stefan Dösinger : wined3d: Only glBindAttribLocation used attributes.
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 672ed031ce1a9d74967772de380421f6a6cd7bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ed031ce1a9d74967772de3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 14:08:23 2007 +0200 wined3d: Only glBindAttribLocation used attributes. --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 14ac4e3..7e79e27 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2697,8 +2697,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use * in order to make the bindings work, and it has to be done prior * to linking the GLSL program. */ for (i = 0; i < max_attribs; ++i) { - snprintf(tmp_name, sizeof(tmp_name), "attrib%i", i); - GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); + if (((IWineD3DBaseShaderImpl*)vshader)->baseShader.reg_maps.attributes[i]) { + snprintf(tmp_name, sizeof(tmp_name), "attrib%i", i); + GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); + } } checkGLcall("glBindAttribLocationARB");

1 0

Juan Lang : wsock32: Check return value rather than returned size for error .
by Alexandre Julliard Nov. 6, 2007

Nov. 6, 2007

Module: wine Branch: master Commit: 182ec0a50d28fb09070ceb0c3c50e0f4e1ba810d URL: http://source.winehq.org/git/wine.git/?a=commit;h=182ec0a50d28fb09070ceb0c3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 5 10:25:11 2007 -0800 wsock32: Check return value rather than returned size for error. --- dlls/wsock32/socket.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 28b526c..d326443 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -441,11 +441,9 @@ DWORD WINAPI WsControl(DWORD protocol, if (!pcbResponseInfoLen) return ERROR_BAD_ENVIRONMENT; - GetIpForwardTable(NULL, &routeTableSize, FALSE); - if (!routeTableSize) { - *pcbResponseInfoLen = 0; - return WSCTL_SUCCESS; - } + ret = GetIpForwardTable(NULL, &routeTableSize, FALSE); + if (ret != ERROR_INSUFFICIENT_BUFFER) + return ret; numRoutes = (routeTableSize - sizeof(MIB_IPFORWARDTABLE)) / sizeof(MIB_IPFORWARDROW) + 1; if (*pcbResponseInfoLen < sizeof(IPRouteEntry) * numRoutes) @@ -494,11 +492,9 @@ DWORD WINAPI WsControl(DWORD protocol, if (!pcbResponseInfoLen) return ERROR_BAD_ENVIRONMENT; - GetIpNetTable(NULL, &arpTableSize, FALSE); - if (!arpTableSize) { - *pcbResponseInfoLen = 0; - return WSCTL_SUCCESS; - } + ret = GetIpNetTable(NULL, &arpTableSize, FALSE); + if (ret != ERROR_INSUFFICIENT_BUFFER) + return ret; numEntries = (arpTableSize - sizeof(MIB_IPNETTABLE)) / sizeof(MIB_IPNETROW) + 1; if (*pcbResponseInfoLen < sizeof(MIB_IPNETROW) * numEntries) @@ -536,11 +532,9 @@ DWORD WINAPI WsControl(DWORD protocol, if (!pcbResponseInfoLen) return ERROR_BAD_ENVIRONMENT; - GetTcpTable(NULL, &tcpTableSize, FALSE); - if (!tcpTableSize) { - *pcbResponseInfoLen = 0; - return WSCTL_SUCCESS; - } + ret = GetTcpTable(NULL, &tcpTableSize, FALSE); + if (ret != ERROR_INSUFFICIENT_BUFFER) + return ret; numEntries = (tcpTableSize - sizeof(MIB_TCPTABLE)) / sizeof(MIB_TCPROW) + 1; if (*pcbResponseInfoLen < sizeof(MIB_TCPROW) * numEntries)

1 0