March 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Fragment processing using GL_ATI_fragment_shader.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 4640be8dc8347f4147cbf87c78b3cfa510fcccc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4640be8dc8347f4147cbf87c7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 22 14:31:52 2008 +0100 wined3d: Fragment processing using GL_ATI_fragment_shader. This adds code for handling fixed function fragment processing with the GL_ATI_fragment_shader extension. This is a sort-of programmable interface for fragment processing at the level of shader model 1.4 in d3d. This code is of use on r200, r250 and r280 cards(radeon 8500 to 9200) which do not support GL_ARB_fragment_program, but support pixel shader 1.4 on Windows. This code is somewhat a counterpart to the existing fragment processing code using GL_NV_register_combiners and GL_NV_texture_shader. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/ati_fragment_shader.c | 789 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/context.c | 29 +- dlls/wined3d/directx.c | 25 ++ dlls/wined3d/state.c | 6 +- dlls/wined3d/utils.c | 146 +++++++ dlls/wined3d/wined3d_main.c | 1 + dlls/wined3d/wined3d_private.h | 36 ++- 8 files changed, 1021 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4640be8dc8347f4147cbf…

1 0

Stefan Dösinger : wined3d: Implement env bump mapping in the atifs ffp replacement.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 9b79bc5e31cb40f7f700a1678a08b0985e6bc951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b79bc5e31cb40f7f700a1678… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 20 18:38:47 2008 +0100 wined3d: Implement env bump mapping in the atifs ffp replacement. --- dlls/wined3d/ati_fragment_shader.c | 149 +++++++++++++++++++++++++++++++++--- dlls/wined3d/utils.c | 5 +- 2 files changed, 142 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b79bc5e31cb40f7f700a…

1 0

Stefan Dösinger : wined3d: Enable D3DFMT_V8U8 with GL_ATI_fragment_shader.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 39e2cbc5d590b0c8b2ce4b9b28bb9f9ea086507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e2cbc5d590b0c8b2ce4b9b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 22 17:02:09 2008 +0100 wined3d: Enable D3DFMT_V8U8 with GL_ATI_fragment_shader. --- dlls/wined3d/directx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3537cb0..bd66cfd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1872,7 +1872,7 @@ static BOOL CheckBumpMapCapability(UINT Adapter, WINED3DFORMAT CheckFormat) return FALSE; } } - if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP) || GL_SUPPORT(ATI_FRAGMENT_SHADER)) { switch (CheckFormat) { case WINED3DFMT_V8U8: TRACE_(d3d_caps)("[OK]\n"); @@ -2119,7 +2119,8 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) * and are still playable even without bump mapping */ case WINED3DFMT_V8U8: - if(GL_SUPPORT(NV_TEXTURE_SHADER) || GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + if(GL_SUPPORT(NV_TEXTURE_SHADER) || GL_SUPPORT(ATI_ENVMAP_BUMPMAP) || + GL_SUPPORT(ATI_FRAGMENT_SHADER)) { return TRUE; } TRACE_(d3d_caps)("[FAILED] - No converted formats on volumes\n");

1 0

Austin English : gdi32: Spelling fixes.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 45b944ed51fc49a89f939c25e37f995d686b8fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b944ed51fc49a89f939c25e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 25 12:35:45 2008 -0500 gdi32: Spelling fixes. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 10 +++++----- dlls/gdi32/metafile.c | 6 +++--- dlls/gdi32/mfdrv/bitblt.c | 2 +- dlls/gdi32/pen.c | 2 +- dlls/gdi32/printdrv16.c | 2 +- dlls/gdi32/region.c | 4 ++-- dlls/gdi32/tests/pen.c | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3c3f4ce..ffd6a1b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1500,7 +1500,7 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) */ INT WINAPI SetICMMode(HDC hdc, INT iEnableICM) { -/*FIXME Asuming that ICM is always off, and cannot be turned on */ +/*FIXME: Assume that ICM is always off, and cannot be turned on */ if (iEnableICM == ICM_OFF) return ICM_OFF; if (iEnableICM == ICM_ON) return 0; if (iEnableICM == ICM_QUERY) return ICM_OFF; diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index c118da5..0be0948 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -158,7 +158,7 @@ static BOOL EMFDRV_BitBlockTransfer( device colors are important. */ lpBmiH->biClrImportant = 0; - /* Initiliaze bitmap bits */ + /* Initialize bitmap bits */ if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, (BYTE*)pEMR + pEMR->offBitsSrc, (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index de82e70..952e720 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2751,7 +2751,7 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, * BUGS * * All flags except GCP_REORDER are not yet implemented. - * Reordering is not 100% complient to the Windows BiDi method. + * Reordering is not 100% compliant to the Windows BiDi method. * Caret positioning is not yet implemented for BiDi. * Classes are not yet implemented. * diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 820da77..04db3ae 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -224,7 +224,7 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif -/* This is bascially a copy of FT_Bitmap_Size with an extra element added */ +/* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; FT_Short width; @@ -483,7 +483,7 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, * FONTS.FON System * OEMFONT.FON Terminal * LogPixels Current dpi set by the display control panel applet - * (HKLM\\Software\\Microsft\\Windows NT\\CurrentVersion\\FontDPI + * (HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI * also has a LogPixels value that appears to mirror this) * * On my system these values have data: vgafix.fon, vgasys.fon, vga850.fon and 96 respectively @@ -2216,7 +2216,7 @@ static void update_font_info(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); - /* Setup DefaultFallback usage */ + /* Setup Default_Fallback usage */ if (ansi_cp == 932) use_default_fallback = TRUE; @@ -3188,7 +3188,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) /* * Check for a leading '@' this signals that the font is being - * requested in tategaki mode (vertical writing subtitution) but + * requested in tategaki mode (vertical writing substitution) but * does not affect the fontface that is to be selected. */ if (lf.lfFaceName[0]=='@') @@ -5264,7 +5264,7 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, else len = cbData; - if(table) { /* MS tags differ in endidness from FT ones */ + if(table) { /* MS tags differ in endianness from FT ones */ table = table >> 24 | table << 24 | (table >> 8 & 0xff00) | (table << 8 & 0xff0000); } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 57add72..57ace68 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -31,7 +31,7 @@ * * Memory-based metafiles are just stored as a continuous block of memory with * a METAHEADER at the head with METARECORDs appended to it. mtType is - * METAFILE_MEMORY (1). Note this is indentical to the disk image of a + * METAFILE_MEMORY (1). Note this is identical to the disk image of a * disk-based metafile - even mtType is METAFILE_MEMORY. * 16bit HMETAFILE16s are global handles to this block * 32bit HMETAFILEs are GDI handles METAFILEOBJs, which contains a ptr to @@ -1270,7 +1270,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) } if (mr->rdSize == len / 2) - dxx = NULL; /* determine if array present */ + dxx = NULL; /* determine if array is present */ else if (mr->rdSize == (len + s1 * sizeof(INT16)) / 2) { @@ -1282,7 +1282,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) TRACE("%s len: %d\n", sot, mr->rdSize); WARN("Please report: ExtTextOut len=%d slen=%d rdSize=%d opt=%04x\n", len, s1, mr->rdSize, mr->rdParm[3]); - dxx = NULL; /* should't happen -- but if, we continue with NULL */ + dxx = NULL; /* shouldn't happen -- but if, we continue with NULL */ } ExtTextOutA( hdc, (SHORT)mr->rdParm[1], /* X position */ diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 578366d..c1b443e 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -49,7 +49,7 @@ BOOL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, /*********************************************************************** * MFDRV_StretchBlt - * this function contains TWO ways for procesing StretchBlt in metafiles, + * this function contains TWO ways for processing StretchBlt in metafiles, * decide between rdFunction values META_STRETCHBLT or META_DIBSTRETCHBLT * via #define STRETCH_VIA_DIB */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index a047c65..6fe39af 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -182,7 +182,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, } else { - /* PS_INSIDEFRAME is applicable only for gemetric pens */ + /* PS_INSIDEFRAME is applicable only for geometric pens */ if ((style & PS_STYLE_MASK) == PS_INSIDEFRAME || width != 1) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index d97261f..bcf2065 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -375,7 +375,7 @@ static int CreateSpoolFile(LPCSTR pszOutput) /** * The file name can be dos based, we have to find its - * Unix correspondant file name + * corresponding Unix file name. */ MultiByteToWideChar(CP_ACP, 0, psCmdP, -1, psCmdPW, MAX_PATH); if ((buffer = wine_get_unix_file_name(psCmdPW))) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 6494840..d0d8580 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -993,7 +993,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) * PARAMS * lpXform [I] World-space to logical-space transformation data. * dwCount [I] Size of the data pointed to by rgndata, in bytes. - * rgndata [I] Data that specifes the region. + * rgndata [I] Data that specifies the region. * * RETURNS * Success: Handle to region. @@ -1239,7 +1239,7 @@ BOOL REGION_FrameRgn( HRGN hDest, HRGN hSrc, INT x, INT y ) /*********************************************************************** * CombineRgn (GDI32.@) * - * Combines two regions with the specifed operation and stores the result + * Combines two regions with the specified operation and stores the result * in the specified destination region. * * PARAMS diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index ada892b..fcd79e6 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -195,7 +195,7 @@ static void test_logpen(void) } if (pen[i].style == PS_INSIDEFRAME) { - /* This style is applicable only for gemetric pens */ + /* This style is applicable only for geometric pens */ ok(hpen == 0, "ExtCreatePen should fail\n"); goto test_geometric_pens; } @@ -347,7 +347,7 @@ test_geometric_pens: memset(&lp, 0xb0, sizeof(lp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(lp), &lp); - /* for some reason XP differenciates PS_NULL here */ + /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) { ok(size == sizeof(LOGPEN), "GetObject returned %d, error %d\n", size, GetLastError()); @@ -404,7 +404,7 @@ test_geometric_pens: break; } - /* for some reason XP differenciates PS_NULL here */ + /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) ok(ext_pen.elp.elpPenStyle == pen[i].ret_style, "expected %x, got %x\n", pen[i].ret_style, ext_pen.elp.elpPenStyle); else

1 0

Stefan Dösinger : wined3d: Add a shader DLL init callback.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: a440051016901da1dc0c945365f1843339c6f600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a440051016901da1dc0c94536… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 22 14:29:50 2008 +0100 wined3d: Add a shader DLL init callback. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++++ 5 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e42a481..8868dac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2058,6 +2058,9 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } +static void shader_arb_load_init(void) { +} + const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, @@ -2072,5 +2075,6 @@ const shader_backend_t arb_program_shader_backend = { &shader_arb_generate_pshader, &shader_arb_generate_vshader, &shader_arb_get_caps, + &shader_arb_load_init, FFPStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1e48194..678b119 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1104,6 +1104,7 @@ static void shader_none_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFF static void shader_none_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer) { FIXME("NONE shader backend asked to generate a vertex shader\n"); } +static void shader_none_load_init(void) {} #define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) { @@ -1185,6 +1186,7 @@ const shader_backend_t none_shader_backend = { &shader_none_generate_pshader, &shader_none_generate_vshader, &shader_none_get_caps, + &shader_none_load_init, FFPStateTable }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 908f5bd..1b476ed 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3580,6 +3580,8 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf TRACE_(d3d_caps)("Hardware pixel shader version %d.%d enabled (GLSL)\n", (pCaps->PixelShaderVersion >> 8) & 0xff, pCaps->PixelShaderVersion & 0xff); } +static void shader_glsl_load_init(void) {} + const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, @@ -3594,5 +3596,6 @@ const shader_backend_t glsl_shader_backend = { &shader_glsl_generate_pshader, &shader_glsl_generate_vshader, &shader_glsl_get_caps, + &shader_glsl_load_init, FFPStateTable }; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 26e7f70..2608604 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -93,6 +93,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DWORD len; WNDCLASSA wc; + glsl_shader_backend.shader_dll_load_init(); + arb_program_shader_backend.shader_dll_load_init(); + none_shader_backend.shader_dll_load_init(); + /* We need our own window class for a fake window which we use to retrieve GL capabilities */ /* We might need CS_OWNDC in the future if we notice strange things on Windows. * Various articles/posts about OpenGL problems on Windows recommend this. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8628f03..ffd44f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -291,6 +291,7 @@ typedef struct { void (*shader_generate_pshader)(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer); void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); + void (*shader_dll_load_init)(void); const struct StateEntry *StateTable; } shader_backend_t; @@ -789,6 +790,9 @@ struct IWineD3DDeviceImpl struct list shaders; /* a linked list to track shaders (pixel and vertex) */ unsigned int highest_dirty_ps_const, highest_dirty_vs_const; + /* TODO: Move this into the shader model private data */ + struct list fragment_shaders; /* A linked list to track fragment pipeline replacement shaders */ + /* Render Target Support */ IWineD3DSurface **render_targets; IWineD3DSurface *auto_depth_stencil_buffer;

1 0

Stefan Dösinger : wined3d: Alloc / free shader private data and blt stuff in Init3D/Uninit3D.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 28fdebe404ddcd9a5c325d48ea859d6346c4edb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fdebe404ddcd9a5c325d48e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:49:05 2008 +0100 wined3d: Alloc / free shader private data and blt stuff in Init3D/Uninit3D. --- dlls/wined3d/device.c | 15 +++++++++++++-- dlls/wined3d/directx.c | 7 +------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12f91af..cfef9ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -173,8 +173,6 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo)); } - This->shader_backend->shader_free_private(iface); - if (This->glsl_program_lookup) hash_table_destroy(This->glsl_program_lookup); /* TODO: Clean up all the surfaces and textures! */ @@ -2084,6 +2082,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR IWineD3DSurface_AddRef(This->stencilBufferTarget); } + hr = This->shader_backend->shader_alloc_private(iface); + if(FAILED(hr)) { + TRACE("Shader private data couldn't be allocated\n"); + goto err_out; + } + /* Set up some starting GL setup */ ENTER_GL(); @@ -2147,6 +2151,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR return WINED3D_OK; err_out: + This->shader_backend->shader_free_private(iface); HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); HeapFree(GetProcessHeap(), 0, This->draw_buffers); @@ -2212,6 +2217,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D IWineD3DDevice_SetTexture(iface, WINED3DVERTEXTEXTURESAMPLER0 + sampler, NULL); } + /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader + * private data, it might contain opengl pointers + */ + This->shader_backend->shader_destroy_depth_blt(iface); + This->shader_backend->shader_free_private(iface); + /* Release the update stateblock */ if(IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock) > 0){ if(This->updateStateBlock != This->stateBlock) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 93f3838..7b6ddf2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3213,12 +3213,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->devType = DeviceType; select_shader_mode(&GLINFO_LOCATION, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); - object->shader_backend = select_shader_backend(Adapter, DeviceType); if(FAILED(object->shader_backend->shader_alloc_private((IWineD3DDevice *) object))) { - IWineD3D_Release(object->wineD3D); - HeapFree(GetProcessHeap(), 0, object); - *ppReturnedDeviceInterface = NULL; - return E_OUTOFMEMORY; - } + object->shader_backend = select_shader_backend(Adapter, DeviceType); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader * model can deal with that. It is essentially the same, just with adjusted

1 0

Stefan Dösinger : wined3d: Add GL_ATI_fragment_shader.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 18e16f4e6693e686fa590871fd898410b7778bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e16f4e6693e686fa590871f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:57:52 2008 +0100 wined3d: Add GL_ATI_fragment_shader. --- dlls/wined3d/directx.c | 1 + include/wine/wined3d_gl.h | 97 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b6ddf2..8873edc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -57,6 +57,7 @@ static const struct { {"GL_ATI_texture_env_combine3", ATI_TEXTURE_ENV_COMBINE3, 0 }, {"GL_ATI_texture_mirror_once", ATI_TEXTURE_MIRROR_ONCE, 0 }, {"GL_ATI_envmap_bumpmap", ATI_ENVMAP_BUMPMAP, 0 }, + {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER, 0 }, /* ARB */ {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1e45b20..671a892 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2920,6 +2920,85 @@ typedef void (WINE_GLAPI * PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #endif +/* GL_ATI_fragment_shader */ +#ifndef GL_ATI_fragment_shader +#define GL_ATI_fragment_shader +typedef GLuint (WINE_GLAPI *PGLFNGENFRAGMENTSHADERSATI) (GLuint range); +typedef void (WINE_GLAPI *PGLFNBINDFRAGMENTSHADERATI) (GLuint id); +typedef void (WINE_GLAPI *PGLFNDELETEFRAGMENTSHADERATI) (GLuint id); +typedef void (WINE_GLAPI *PGLFNBEGINFRAGMENTSHADERATI) (); +typedef void (WINE_GLAPI *PGLFNENDFRAGMENTSHADERATI) (); +typedef void (WINE_GLAPI *PGLFNPASSTEXCOORDATI) (GLuint dst, GLuint coord, GLenum swizzle); +typedef void (WINE_GLAPI *PGLFNSAMPLEMAPATI) (GLuint dst, GLuint interp, GLenum swizzle); +typedef void (WINE_GLAPI *PGLFNCOLORFRAGMENTOP1ATI) (GLenum op, GLuint dst, GLuint dstMask, + GLuint dstMod, GLuint arg1, GLuint arg1Rep, + GLuint arg1Mod); +typedef void (WINE_GLAPI *PGLFNCOLORFRAGMENTOP2ATI) (GLenum op, GLuint dst, GLuint dstMask, + GLuint dstMod, GLuint arg1, GLuint arg1Rep, + GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, + GLuint arg2Mod); +typedef void (WINE_GLAPI *PGLFNCOLORFRAGMENTOP3ATI) (GLenum op, GLuint dst, GLuint dstMask, + GLuint dstMod, GLuint arg1, GLuint arg1Rep, + GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, + GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, + GLuint arg3Mod); +typedef void (WINE_GLAPI *PGLFNALPHAFRAGMENTOP1ATI) (GLenum op, GLuint dst, GLuint dstMod, + GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); +typedef void (WINE_GLAPI *PGLFNALPHAFRAGMENTOP2ATI) (GLenum op, GLuint dst, GLuint dstMod, + GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, + GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); +typedef void (WINE_GLAPI *PGLFNALPHAFRAGMENTOP3ATI) (GLenum op, GLuint dst, GLuint dstMod, + GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, + GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, + GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); +typedef void (WINE_GLAPI *PGLFNSETFRAGMENTSHADERCONSTANTATI) (GLuint dst, const GLfloat *value); +#define GL_FRAGMENT_SHADER_ATI 0x8920 +#define GL_REG_0_ATI 0x8921 +#define GL_REG_1_ATI 0x8922 +#define GL_REG_2_ATI 0x8923 +#define GL_REG_3_ATI 0x8924 +#define GL_REG_4_ATI 0x8925 +#define GL_REG_5_ATI 0x8926 +#define GL_CON_0_ATI 0x8941 +#define GL_CON_1_ATI 0x8942 +#define GL_CON_2_ATI 0x8943 +#define GL_CON_3_ATI 0x8944 +#define GL_CON_4_ATI 0x8945 +#define GL_CON_5_ATI 0x8946 +#define GL_CON_6_ATI 0x8947 +#define GL_CON_7_ATI 0x8948 +#define GL_MOV_ATI 0x8961 +#define GL_ADD_ATI 0x8963 +#define GL_MUL_ATI 0x8964 +#define GL_SUB_ATI 0x8965 +#define GL_DOT3_ATI 0x8966 +#define GL_DOT4_ATI 0x8967 +#define GL_MAD_ATI 0x8968 +#define GL_LERP_ATI 0x8969 +#define GL_CND_ATI 0x896A +#define GL_CND0_ATI 0x896B +#define GL_DOT2_ADD_ATI 0x896C +#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D +#define GL_SWIZZLE_STR_ATI 0x8976 +#define GL_SWIZZLE_STQ_ATI 0x8977 +#define GL_SWIZZLE_STR_DR_ATI 0x8978 +#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 +#define GL_RED_BIT_ATI 0x00000001 +#define GL_GREEN_BIT_ATI 0x00000002 +#define GL_BLUE_BIT_ATI 0x00000004 +#define GL_2X_BIT_ATI 0x00000001 +#define GL_4X_BIT_ATI 0x00000002 +#define GL_8X_BIT_ATI 0x00000004 +#define GL_HALF_BIT_ATI 0x00000008 +#define GL_QUARTER_BIT_ATI 0x00000010 +#define GL_EIGHTH_BIT_ATI 0x00000020 +#define GL_SATURATE_BIT_ATI 0x00000040 +#define GL_2X_BIT_ATI 0x00000001 +#define GL_COMP_BIT_ATI 0x00000002 +#define GL_NEGATE_BIT_ATI 0x00000004 +#define GL_BIAS_BIT_ATI 0x00000008 +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3281,6 +3360,7 @@ typedef enum _GL_SupportedExt { ATI_TEXTURE_MIRROR_ONCE, EXT_VERTEX_SHADER, ATI_ENVMAP_BUMPMAP, + ATI_FRAGMENT_SHADER, /* APPLE */ APPLE_FENCE, APPLE_CLIENT_STORAGE, @@ -3578,7 +3658,22 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNFINISHRENDERAPPLEPROC, glFinishRenderApple, APPLE_FLUSH_RENDER, NULL );\ /* GL_EXT_gpu_program_parameters */ \ USE_GL_FUNC(PGLFNPROGRAMENVPARAMETERS4FVEXTPROC, glProgramEnvParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL );\ - USE_GL_FUNC(PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC, glProgramLocalParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL ); + USE_GL_FUNC(PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC, glProgramLocalParameters4fvEXT, EXT_GPU_PROGRAM_PARAMETERS,NULL );\ + /* GL_ATI_fragment_shader */ \ + USE_GL_FUNC(PGLFNGENFRAGMENTSHADERSATI, glGenFragmentShadersATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNBINDFRAGMENTSHADERATI, glBindFragmentShaderATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNDELETEFRAGMENTSHADERATI, glDeleteFragmentShaderATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNBEGINFRAGMENTSHADERATI, glBeginFragmentShaderATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNENDFRAGMENTSHADERATI, glEndFragmentShaderATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNPASSTEXCOORDATI, glPassTexCoordATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNSAMPLEMAPATI, glSampleMapATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNCOLORFRAGMENTOP1ATI, glColorFragmentOp1ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNCOLORFRAGMENTOP2ATI, glColorFragmentOp2ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNCOLORFRAGMENTOP3ATI, glColorFragmentOp3ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNALPHAFRAGMENTOP1ATI, glAlphaFragmentOp1ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNALPHAFRAGMENTOP2ATI, glAlphaFragmentOp2ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNALPHAFRAGMENTOP3ATI, glAlphaFragmentOp3ATI, ATI_FRAGMENT_SHADER, NULL );\ + USE_GL_FUNC(PGLFNSETFRAGMENTSHADERCONSTANTATI, glSetFragmentShaderConstantATI, ATI_FRAGMENT_SHADER, NULL ); /**************************************************** * OpenGL WGL defines and functions pointer

1 0

Stefan Dösinger : wined3d: Free shader private data on reset.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: ac57b4e2f57b4130702de0264508551e2b1f528e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac57b4e2f57b4130702de0264… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:31:24 2008 +0100 wined3d: Free shader private data on reset. Since the shader backend implementations might track opengl resources in their private data inform them about reset calls. For example, the atifs backend keeps track of the replacement shaders, which are lost during an opengl context recreation. --- dlls/wined3d/device.c | 11 +++++++++-- dlls/wined3d/glsl_shader.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dea417c..12f91af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7029,6 +7029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->depth_blt_texture = 0; } This->shader_backend->shader_destroy_depth_blt(iface); + This->shader_backend->shader_free_private(iface); for (i = 0; i < GL_LIMITS(textures); i++) { /* Textures are recreated below */ @@ -7123,6 +7124,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE &swapchain->presentParms); swapchain->num_contexts = 1; This->activeContext = swapchain->context[0]; + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); hr = IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *) This->stateBlock); if(FAILED(hr)) { @@ -7130,11 +7132,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } create_dummy_textures(This); + + hr = This->shader_backend->shader_alloc_private(iface); + if(FAILED(hr)) { + ERR("Failed to recreate shader private data\n"); + return hr; + } + /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use */ - - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4f7b527..908f5bd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3378,6 +3378,7 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { static void shader_glsl_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; HeapFree(GetProcessHeap(), 0, This->shader_priv); + This->shader_priv = NULL; } static BOOL shader_glsl_dirty_const(IWineD3DDevice *iface) {

1 0

Stefan Dösinger : d3d9: Add a projected texture test.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: aaced1f5babed236a4b1b0269e69d58ac2899dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaced1f5babed236a4b1b0269… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 5 23:17:01 2008 +0100 d3d9: Add a projected texture test. --- dlls/d3d9/tests/visual.c | 141 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaced1f5babed236a4b1b…

1 0

Stefan Dösinger : wined3d: Set shader specific caps in the shader backend.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 5ab5202e0f991cf94b2be5b197af864ff5188f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab5202e0f991cf94b2be5b19… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:39:26 2008 +0100 wined3d: Set shader specific caps in the shader backend. The whole control structures in directx.c get terribly confusing with the various codepaths for texturing and different shader implementations. It is also hard to reflect the shader model decisions this way too. This patch moves the shader specific parts of the caps code into the shader backend where we can set our caps dependent of the shader model decisions and without complex caps flag checks. --- dlls/wined3d/arb_program_shader.c | 5 + dlls/wined3d/baseshader.c | 199 +++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 236 ++++++------------------------------- dlls/wined3d/glsl_shader.c | 5 + dlls/wined3d/wined3d_private.h | 26 ++++ 5 files changed, 269 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ab5202e0f991cf94b2be…

1 0