December 2008 - Wine-commits

Zachary Goldberg : Milestone News Item
by Jeremy Newman 16 Dec '08

16 Dec '08

Module: website Branch: master Commit: 61912782eba7c21e3fbaf488f20d322b7d36f174 URL: http://source.winehq.org/git/website.git/?a=commit;h=61912782eba7c21e3fbaf4… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 15 23:31:18 2008 -0500 Milestone News Item Add a news item to the winehq.org homepage about the test pass. --- news/en/2008121501.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/en/2008121501.xml b/news/en/2008121501.xml new file mode 100644 index 0000000..9fedcfa --- /dev/null +++ b/news/en/2008121501.xml @@ -0,0 +1,19 @@ +<news> + <date>December 16, 2008</date> + <title>Major Milestone: Somebody's machine passes Wine's test suite!</title> + <body> + <p> + One of the most puzzling and poorly understood phenomena in the Wine + community is how Alexandre Julliard's machine has been the only one to pass + Wine's test suite for years. + </p> + <p> + While we are no closer to understanding the source of the problem we have identified + another machine to pass the suite without any errors! The + <a href="http://test.winehq.org/data/bd25af9dba280e3d80f3080140f2f5ab2cd0dfb3/wine_x…"> + magical machine</a> that <a href="http://test.winehq.org/data/bd25af9dba280e3d80f3080140f2f5ab2cd0dfb3/">passed</a> + (the first non-red, orange, header on test.winehq.org!) is run by + <a href="http://www.winehq.org/pipermail/wine-devel/2008-December/071186.html">Alasdair Sinclair</a>. + </p> + </body> +</news>

1 0

Maurilio Genovese : fix RSS link
by Jeremy Newman 16 Dec '08

16 Dec '08

Module: website Branch: master Commit: 30ab3f073d27a20ad628a45cd1501c5984d6f9f3 URL: http://source.winehq.org/git/website.git/?a=commit;h=30ab3f073d27a20ad628a4… Author: Maurilio Genovese <repository(a)lamaresh.net> Date: Tue Dec 16 09:37:57 2008 -0600 fix RSS link --- include/plugins/news.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index 9941e63..bda5eef 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -108,7 +108,7 @@ switch (true) // default view default: // load rss link - $html->rss_link = "{$config->base_url}/news_rss/"; + $html->rss_link = "{$config->base_url}/news/rss/"; // max count for posts per page $amax = (PAGE == "home" ? 10 : 25);

1 0

Stefan Dösinger : wined3d: Get rid of IWineD3DPixelShaderImpl_GenerateShader.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 704f9ea5d18cc005b576e1da302cac05463b50f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704f9ea5d18cc005b576e1da3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:24:36 2008 +0100 wined3d: Get rid of IWineD3DPixelShaderImpl_GenerateShader. --- dlls/wined3d/pixelshader.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 1dd3888..b6b84b0 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -296,20 +296,6 @@ static void pshader_set_limits( } } -/** Generate a pixel shader string using either GL_FRAGMENT_PROGRAM_ARB - or GLSL and send it to the card */ -static inline GLuint IWineD3DPixelShaderImpl_GenerateShader( - IWineD3DPixelShaderImpl *This) { - SHADER_BUFFER buffer; - GLuint shader; - - shader_buffer_init(&buffer); - shader = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); - shader_buffer_free(&buffer); - - return shader; -} - static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) { IWineD3DPixelShaderImpl *This =(IWineD3DPixelShaderImpl *)iface; @@ -436,6 +422,7 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps { CONST DWORD *function = This->baseShader.function; GLuint retval; + SHADER_BUFFER buffer; TRACE("(%p) : function %p\n", This, function); @@ -447,7 +434,9 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); - retval = IWineD3DPixelShaderImpl_GenerateShader(This); + shader_buffer_init(&buffer); + retval = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); + shader_buffer_free(&buffer); This->baseShader.is_compiled = TRUE;

1 0

Stefan Dösinger : wined3d: Avoid loading opengl32.dll.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 2aa7a7fe16678c4c23a452e5b00bf4c085be98c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa7a7fe16678c4c23a452e5b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 23 12:43:15 2008 +0100 wined3d: Avoid loading opengl32.dll. This confuses applications like Steam, which hook d3d9 and opengl functions. It sees that the application uses opengl32, but it doesn't realize that d3d9 is wrapped to opengl. Thus it starts messing around with wined3d's wgl context. It usually tries to draw geometry with the context, but cannot deal with some of the obscure extensions we have activated. --- dlls/wined3d/directx.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32e46c9..d8ec3ef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4157,7 +4157,7 @@ static void fillGLAttribFuncs(const WineD3D_GL_Info *gl_info) #define PUSH1(att) attribs[nAttribs++] = (att); BOOL InitAdapters(void) { - static HMODULE mod_gl, mod_win32gl; + static HMODULE mod_gl; BOOL ret; int ps_selected_mode, vs_selected_mode; @@ -4181,11 +4181,6 @@ BOOL InitAdapters(void) { #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ mod_gl = GetModuleHandleA("gdi32.dll"); - mod_win32gl = LoadLibraryA("opengl32.dll"); - if(!mod_win32gl) { - ERR("Can't load opengl32.dll!\n"); - goto nogl_adapter; - } #endif } @@ -4206,8 +4201,13 @@ BOOL InitAdapters(void) { /* Load glFinish and glFlush from opengl32.dll even if we're not using WIN32 opengl * otherwise because we have to use winex11.drv's override */ - glFinish = (void*)GetProcAddress(mod_win32gl, "glFinish"); - glFlush = (void*)GetProcAddress(mod_win32gl, "glFlush"); +#ifdef USE_WIN32_OPENGL + glFinish = (void*)GetProcAddress(mod_gl, "glFinish"); + glFlush = (void*)GetProcAddress(mod_gl, "glFlush"); +#else + glFinish = (void*)pwglGetProcAddress("wglFinish"); + glFlush = (void*)pwglGetProcAddress("wglFlush"); +#endif /* For now only one default adapter */ {

1 0

Stefan Dösinger : wined3d: Correct a stage number.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 5315b7992d2c493e1f8656c0f96139207a77fc6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5315b7992d2c493e1f8656c0f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 11 23:11:30 2008 +0100 wined3d: Correct a stage number. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6fda3ef..f3fead1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2505,7 +2505,7 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, switch(op) { case WINED3DTOP_DISABLE: - if(stage == 1) shader_addline(buffer, "MOV %s%s, fragment.color.primary;\n", dstreg, dstmask); + if(stage == 0) shader_addline(buffer, "MOV %s%s, fragment.color.primary;\n", dstreg, dstmask); break; case WINED3DTOP_SELECTARG2:

1 0

Stefan Dösinger : wined3d: Initialize max_combined_samplers properly.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 4bc5e760b6545df7793f12ceb5872b9aa19f1663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc5e760b6545df7793f12ceb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 00:03:43 2008 +0100 wined3d: Initialize max_combined_samplers properly. Otherwise it will be 0 if GL_ARB_multitexture is not available. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 525a340..32e46c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -713,7 +713,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->max_texture_stages = 1; gl_info->max_fragment_samplers = 1; gl_info->max_vertex_samplers = 0; - gl_info->max_combined_samplers = 0; + gl_info->max_combined_samplers = gl_info->max_fragment_samplers + gl_info->max_vertex_samplers; gl_info->max_sampler_stages = 1; gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED; gl_info->ps_arb_max_temps = 0;

1 0

Stefan Dösinger : wined3d: Emulate GL_EXT_fog_coord.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 31da3c0578aff2ddbd09226c7c55f83da400bdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31da3c0578aff2ddbd09226c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:21:37 2008 +0100 wined3d: Emulate GL_EXT_fog_coord. --- dlls/wined3d/context.c | 4 + dlls/wined3d/gl_compat.c | 354 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 37 ++--- dlls/wined3d/wined3d_private.h | 7 + 4 files changed, 381 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31da3c0578aff2ddbd092…

1 0

Stefan Dösinger : wined3d: Remove some needless initializations.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: d707f018df2f1cf9b7cda0441eb910ecbc0e3b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d707f018df2f1cf9b7cda0441… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 15:47:07 2008 +0100 wined3d: Remove some needless initializations. They're not needed, they are handled by the state management anyway. --- dlls/wined3d/context.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a34f877..3b5000c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -839,12 +839,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glClear"); - glColor3f(1.0, 1.0, 1.0); - checkGLcall("glColor3f"); - - glEnable(GL_LIGHTING); - checkGLcall("glEnable"); - glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);");

1 0

Stefan Dösinger : wined3d: Some GL_EXT_fog_coord prototype fixes.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 4b268c79d74824a9029e7330b2048ac95de8e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b268c79d74824a9029e7330b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 16 13:23:15 2008 +0100 wined3d: Some GL_EXT_fog_coord prototype fixes. --- dlls/wined3d/wined3d_gl.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f92adc6..bca828d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2288,10 +2288,10 @@ typedef void (WINE_GLAPI * PGLFNBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, G #define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 #define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 #endif /* GL_EXT_fog_coord */ -typedef void (WINE_GLAPI * PGLFNGLFOGCOORDFEXTPROC) (GLfloat intesity); -typedef void (WINE_GLAPI * PGLFNGLFOGCOORDFVEXTPROC) (GLfloat intesity); -typedef void (WINE_GLAPI * PGLFNGLFOGCOORDDEXTPROC) (GLfloat intesity); -typedef void (WINE_GLAPI * PGLFNGLFOGCOORDDVEXTPROC) (GLfloat intesity); +typedef void (WINE_GLAPI * PGLFNGLFOGCOORDFEXTPROC) (GLfloat coord); +typedef void (WINE_GLAPI * PGLFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); +typedef void (WINE_GLAPI * PGLFNGLFOGCOORDDEXTPROC) (GLdouble coord); +typedef void (WINE_GLAPI * PGLFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); typedef void (WINE_GLAPI * PGLFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, GLvoid *data); /* GL_ARB_shader_objects (GLSL) */ #ifndef GL_ARB_shader_objects @@ -3471,7 +3471,7 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNGLFOGCOORDFEXTPROC, glFogCoordfEXT, EXT_FOG_COORD, NULL )\ USE_GL_FUNC(PGLFNGLFOGCOORDFVEXTPROC, glFogCoordfvEXT, EXT_FOG_COORD, NULL )\ USE_GL_FUNC(PGLFNGLFOGCOORDDEXTPROC, glFogCoorddEXT, EXT_FOG_COORD, NULL )\ - USE_GL_FUNC(PGLFNGLFOGCOORDDVEXTPROC, glFogCoordvEXT, EXT_FOG_COORD, NULL )\ + USE_GL_FUNC(PGLFNGLFOGCOORDDVEXTPROC, glFogCoorddvEXT, EXT_FOG_COORD, NULL )\ USE_GL_FUNC(PGLFNGLFOGCOORDPOINTEREXTPROC, glFogCoordPointerEXT, EXT_FOG_COORD, NULL )\ /* GL_EXT_framebuffer_object */ \ USE_GL_FUNC(PGLFNGLISRENDERBUFFEREXTPROC, glIsRenderbufferEXT, EXT_FRAMEBUFFER_OBJECT, NULL )\

1 0

Stefan Dösinger : wined3d: Reinstall the G16R16F format surface load fixup.
by Alexandre Julliard 16 Dec '08

16 Dec '08

Module: wine Branch: master Commit: 0dc0444c14c34cf90aba8b8a1af401571c959ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc0444c14c34cf90aba8b8a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:14:15 2008 +0100 wined3d: Reinstall the G16R16F format surface load fixup. We cannot remove this because we still have to load the surface as RGB. The shader may take care of setting the blue channel to 1.0 now, but we still get the red and green channels loaded incorrectly if we don't insert a blue channel before loading. --- dlls/wined3d/surface.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b43697e..0eedf23 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1696,6 +1696,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 2; break; + case WINED3DFMT_G16R16: + *convert = CONVERT_G16R16; + *format = GL_RGB; + *internal = GL_RGB16_EXT; + *type = GL_UNSIGNED_SHORT; + *target_bpp = 6; + break; + default: break; } @@ -2023,6 +2031,27 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } + case CONVERT_G16R16: + { + unsigned int x, y; + const WORD *Source; + WORD *Dest; + + for(y = 0; y < height; y++) { + Source = (const WORD *)(src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + WORD green = (*Source++); + WORD red = (*Source++); + Dest[0] = green; + Dest[1] = red; + Dest[2] = 0xffff; + Dest += 3; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1611812..a8438ce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1679,6 +1679,7 @@ typedef enum { CONVERT_Q8W8V8U8, CONVERT_V16U16, CONVERT_A4L4, + CONVERT_G16R16, } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0