Changeset 40125 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 14, 2012 11:38:59 AM (13 years ago)

Author:

vboxsync

Message:

wine: fix shader version detection, some extensions-to-caps fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• Wine/d3d9/directx.c (modified) (1 diff)
• Wine/wined3d/directx.c (modified) (1 diff)
• Wine/wined3d/glsl_shader.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -3200 +3200 @@
 static HRESULT APIENTRY vboxWddmDispGetCaps (HANDLE hAdapter, CONST D3DDDIARG_GETCAPS* pData)
 {
+        VBOXDISP_DDI_PROLOGUE();
+
     vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p), caps type(%d)\n", hAdapter, pData->Type));
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/directx.c

@@ -445 +445 @@
     pCaps->RasterCaps |= D3DPRASTERCAPS_SUBPIXEL | D3DPRASTERCAPS_STIPPLE | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_COLORPERSPECTIVE /* keep */;
     pCaps->TextureCaps |= D3DPTEXTURECAPS_TRANSPARENCY | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE;
-    pCaps->TextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE;
-    pCaps->VolumeTextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE;
+//    pCaps->TextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE;
+//    pCaps->VolumeTextureAddressCaps |= D3DPTADDRESSCAPS_MIRRORONCE;
     pCaps->StencilCaps |= D3DSTENCILCAPS_TWOSIDED;
     pCaps->DeclTypes |= D3DDTCAPS_FLOAT16_2 | D3DDTCAPS_FLOAT16_4;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -93 +93 @@
     {"GL_ARB_texture_float",                ARB_TEXTURE_FLOAT,              0                           },
     {"GL_ARB_texture_mirrored_repeat",      ARB_TEXTURE_MIRRORED_REPEAT,    0                           },
+    {"GL_IBM_texture_mirrored_repeat",      ARB_TEXTURE_MIRRORED_REPEAT,    0                           },
     {"GL_ARB_texture_non_power_of_two",     ARB_TEXTURE_NON_POWER_OF_TWO,   MAKEDWORD_VERSION(2, 0)     },
     {"GL_ARB_texture_rectangle",            ARB_TEXTURE_RECTANGLE,          0                           },

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c

@@ -5043 +5043 @@
      */
     if ((gl_info->supported[NV_VERTEX_PROGRAM2] && !gl_info->supported[NV_VERTEX_PROGRAM3])
-            || gl_info->limits.arb_ps_instructions <= 512)
+            || gl_info->limits.arb_ps_instructions <= 512
+            || gl_info->limits.glsl_vs_float_constants < 256)
         pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0);
     else
@@ -5062 +5063 @@
      */
     if ((gl_info->supported[NV_FRAGMENT_PROGRAM] && !gl_info->supported[NV_FRAGMENT_PROGRAM2])
-            || gl_info->limits.arb_ps_instructions <= 512)
+            || gl_info->limits.arb_ps_instructions <= 512
+            || gl_info->limits.glsl_vs_float_constants < 256)
         pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0);
     else