Changeset 33046 in vbox for trunk/src

Timestamp:

Oct 11, 2010 5:28:33 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66570

Message:

crOpenGL/wddm: some texture mirroring code

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• basetexture.c (modified) (1 diff)
• glsl_shader.c (modified) (4 diffs)
• shader.c (modified) (2 diffs)
• state.c (modified) (1 diff)
• wined3d_private.h (modified) (2 diffs)

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

@@ -67 +67 @@
     texture->baseTexture.is_srgb = FALSE;
     texture->baseTexture.pow2Matrix_identity = TRUE;
+#if defined(VBOX_WITH_WDDM) && defined(DEBUG_leo)
+    texture->baseTexture.t_mirror = TRUE;
+#else
+    texture->baseTexture.t_mirror = FALSE;
+#endif
 
     if (texture->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING)

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

@@ -1942 +1942 @@
     struct color_fixup_desc fixup;
     BOOL np2_fixup = FALSE;
+    BOOL tmirror_tmp_reg = FALSE;
     va_list args;
 
@@ -1952 +1953 @@
         sampler_base = "Psampler";
 
-        if(priv->cur_ps_args->np2_fixup & (1 << sampler)) {
+        if (priv->cur_ps_args->np2_fixup & (1 << sampler)) {
             if(bias) {
                 FIXME("Biased sampling from NP2 textures is unsupported\n");
@@ -1959 +1960 @@
             }
         }
+
+        if (priv->cur_ps_args->t_mirror & (1 << sampler))
+        {
+            if (ins->ctx->reg_maps->sampler_type[sampler]==WINED3DSTT_2D)
+            {
+                if (sample_function->coord_mask & WINED3DSP_WRITEMASK_1)
+                {
+                    glsl_src_param_t coord_param;
+                    shader_glsl_add_src_param(ins, &ins->src[0], sample_function->coord_mask, &coord_param);
+
+                    if (ins->src[0].reg.type != WINED3DSPR_INPUT)
+                    {
+                        shader_addline(ins->ctx->buffer, "%s.y=1.0-%s.y;\n",
+                                       coord_param.reg_name, coord_param.reg_name);
+                    }
+                    else
+                    {
+                        tmirror_tmp_reg = TRUE;
+                        shader_addline(ins->ctx->buffer, "tmp0.xy=vec2(%s.x, 1.0-%s.y).xy;\n",
+                                       coord_param.reg_name, coord_param.reg_name);
+                    }
+                }
+                else
+                {
+                    DebugBreak();
+                    FIXME("Unexpected coord_mask with t_mirror\n");
+                }
+            }
+        }
     } else {
         sampler_base = "Vsampler";
@@ -1968 +1998 @@
     shader_addline(ins->ctx->buffer, "%s(%s%u, ", sample_function->name, sampler_base, sampler);
 
-    va_start(args, coord_reg_fmt);
-    shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args);
-    va_end(args);
+    if (tmirror_tmp_reg)
+    {
+        shader_addline(ins->ctx->buffer, "%s", "tmp0.xy");
+    }
+    else
+    {
+        va_start(args, coord_reg_fmt);
+        shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args);
+        va_end(args);
+    }
 
     if(bias) {

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

@@ -2020 +2020 @@
     args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0;
     args->np2_fixup = 0;
+    args->t_mirror = 0;
 
     for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i)
@@ -2036 +2037 @@
         {
             args->np2_fixup |= (1 << i);
+        }
+
+        if (texture->baseTexture.t_mirror)
+        {
+            args->t_mirror |= (1 << i);
         }
     }

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

@@ -4533 +4533 @@
         {
             GLfloat yoffset = -(63.0f / 64.0f) / stateblock->viewport.Height;
+#if !defined(VBOX_WITH_WDDM) || !defined(DEBUG_leo)
             device->posFixup[1] = context->render_offscreen ? -1.0f : 1.0f;
+#else
+            device->posFixup[1] = context->render_offscreen ? 1.0f : -1.0f;
+#endif
             device->posFixup[3] = device->posFixup[1] * yoffset;
         }

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

@@ -716 +716 @@
        D3D9 has a limit of 16 samplers and the fixup is superfluous
        in D3D10 (unconditional NP2 support mandatory). */
+    WORD                        t_mirror;
 };
 
@@ -1907 +1908 @@
     BOOL                    is_srgb;
     BOOL                    pow2Matrix_identity;
+    BOOL                    t_mirror;
     const struct min_lookup *minMipLookup;
     const GLenum            *magLookup;