Changeset 59741 in vbox for trunk/src/VBox/Devices/Graphics/shaderlib

Timestamp:

Feb 19, 2016 3:11:35 PM (9 years ago)

Author:

vboxsync

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

105608

Message:

SVGA3d: Applied patch for supporting pretransformed vertices (SVGA3D_DECLUSAGE_POSITIONT) from trivirt.

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• glsl_shader.c (modified) (2 diffs)
• shaderapi.c (modified) (4 diffs)
• shaderlib.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -4262 +4262 @@
 }
 
+#ifdef VBOX_WITH_VMSVGA
+static GLhandleARB generate_passthrough_vshader(const struct wined3d_gl_info *gl_info)
+{
+    GLhandleARB ret = 0;
+    static const char *passthrough_vshader[] =
+    {
+        "#version 120\n"
+        "vec4 R0;\n"
+        "void main(void)\n"
+        "{\n"
+        "    R0   = gl_Vertex;\n"
+        "    R0.w = 1.0;\n"
+        "    R0.z = 0.0;\n"
+        "    gl_Position   = gl_ModelViewProjectionMatrix * R0;\n"
+        "}\n"
+    };
+
+    ret = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB));
+    checkGLcall("glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)");
+    GL_EXTCALL(glShaderSourceARB(ret, 1, passthrough_vshader, NULL));
+    checkGLcall("glShaderSourceARB(ret, 1, passthrough_vshader, NULL)");
+    GL_EXTCALL(glCompileShaderARB(ret));
+    checkGLcall("glCompileShaderARB(ret)");
+    shader_glsl_validate_compile_link(gl_info, ret, FALSE);
+
+    return ret;
+}
+
+#endif
+
 /* GL locking is done by the caller */
 static void hardcode_local_constants(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info,
@@ -4710 +4740 @@
         list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry);
     }
+#ifdef VBOX_WITH_VMSVGA
+    else
+    if (device->strided_streams.position_transformed)
+    {
+        GLhandleARB passthrough_vshader_id;
+
+        passthrough_vshader_id = generate_passthrough_vshader(gl_info);
+        TRACE("Attaching GLSL shader object %p to program %p\n", (void *)(uintptr_t)passthrough_vshader_id, (void *)(uintptr_t)programId);
+        GL_EXTCALL(glAttachObjectARB(programId, passthrough_vshader_id));
+        checkGLcall("glAttachObjectARB");
+        /* Flag the reorder function for deletion, then it will be freed automatically when the program
+         * is destroyed
+         */
+        GL_EXTCALL(glDeleteObjectARB(passthrough_vshader_id));
+    }
+#endif
+
 
     /* Attach GLSL pshader */

trunk/src/VBox/Devices/Graphics/shaderlib/shaderapi.c

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
 #include <iprt/err.h>
 #include <iprt/mem.h>
@@ -626 +625 @@
 }
 
+SHADERDECL(int) ShaderSetPositionTransformed(void *pShaderContext, unsigned cxViewPort, unsigned cyViewPort, bool fPreTransformed)
+{
+    IWineD3DDeviceImpl *This;
+    int rc;
+
+    SHADER_SET_CURRENT_CONTEXT(pShaderContext);
+    This = g_pCurrentContext->pDeviceContext;
+
+    if (This->strided_streams.position_transformed == fPreTransformed)
+        return VINF_SUCCESS;    /* no changes; nothing to do. */
+
+    Log(("ShaderSetPositionTransformed viewport (%d,%d) fPreTransformed=%d\n", cxViewPort, cyViewPort, fPreTransformed));
+    
+    if (fPreTransformed)
+    {   /* In the pre-transformed vertex coordinate case we need to disable all transformations as we're already using screen coordinates. */
+        /* Load the identity matrix for the model view */
+        glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
+
+        /* Reset the projection matrix too */
+        rc = ShaderTransformProjection(cxViewPort, cyViewPort, NULL, fPreTransformed);
+        AssertRCReturn(rc, rc);
+    }
+
+    This->strided_streams.position_transformed = fPreTransformed;
+    ((IWineD3DVertexDeclarationImpl *)(This->stateBlock->vertexDecl))->position_transformed = fPreTransformed;
+    return VINF_SUCCESS;
+}
+
 SHADERDECL(int) ShaderUpdateState(void *pShaderContext, uint32_t rtHeight)
 {
@@ -668 +696 @@
 }
 
-SHADERDECL(int) ShaderTransformProjection(unsigned cxViewPort, unsigned cyViewPort, float matrix[16])
+SHADERDECL(int) ShaderTransformProjection(unsigned cxViewPort, unsigned cyViewPort, float matrix[16], bool fPretransformed)
 {
 #ifdef DEBUG
@@ -723 +751 @@
 
     glTranslatef(xoffset, -yoffset, -1.0f);
-    /* flip y coordinate origin too */
-    glScalef(1.0f, -1.0f, 2.0f);
-
-    glMultMatrixf(matrix);
-
+
+    if (fPretransformed) 
+    {
+        /* One world coordinate equals one screen pixel; y-inversion no longer an issue */
+        glOrtho(0, cxViewPort, 0, cyViewPort, -1, 1);
+    }
+    else
+    {
+        /* flip y coordinate origin too */
+        glScalef(1.0f, -1.0f, 2.0f);
+
+        /* Apply the supplied projection matrix */
+        glMultMatrixf(matrix);
+    }
 #ifdef DEBUG
     lastError = glGetError();                                     \

trunk/src/VBox/Devices/Graphics/shaderlib/shaderlib.h

@@ -87 +87 @@
 SHADERDECL(int) ShaderSetPixelShaderConstantF(void *pShaderContext, uint32_t reg, const float *pValues, uint32_t cRegisters);
 
+SHADERDECL(int) ShaderSetPositionTransformed(void *pShaderContext, unsigned cxViewPort, unsigned cyViewPort, bool fPreTransformed);
+
 SHADERDECL(int) ShaderUpdateState(void *pShaderContext, uint32_t rtHeight);
 
-SHADERDECL(int) ShaderTransformProjection(unsigned cxViewPort, unsigned cyViewPort, float matrix[16]);
+SHADERDECL(int) ShaderTransformProjection(unsigned cxViewPort, unsigned cyViewPort, float matrix[16], bool fPretransformed);
 
 RT_C_DECLS_END