Changeset 49170 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d

Timestamp:

Oct 17, 2013 6:58:57 PM (11 years ago)

Author:

vboxsync

Message:

wined3d: always emit zero vertattr

Location:

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

Files:

• device.c (modified) (2 diffs)
• drawprim.c (modified) (2 diffs)
• state.c (modified) (3 diffs)
• wined3d_private.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c

@@ -1340 +1340 @@
     context = context_acquire(device, NULL);
     gl_info = context->gl_info;
+
+    zv_destroy(device);
 
     if (device->logo_surface)
@@ -5709 +5711 @@
 }
 #endif
+
+
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+static GLuint zv_value_el_size(GLenum enmzvValue)
+{
+    switch (enmzvValue)
+    {
+        case GL_FLOAT:
+            return 4;
+        case GL_UNSIGNED_SHORT:
+        case GL_SHORT:
+            return 2;
+        case GL_BYTE:
+        case GL_UNSIGNED_BYTE:
+            return 1;
+        default:
+            ERR("unexpected value type %#x\n", enmzvValue);
+            return 0;
+    }
+}
+
+static void zv_create(struct wined3d_device *device, GLenum enmzvValue, GLuint czvValue, GLuint czvValueElements, const GLvoid *pzvValue)
+{
+    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+    GLuint cbValel = zv_value_el_size(enmzvValue);
+    GLuint cbVal = cbValel * czvValueElements;
+    GLuint cbBuf = cbVal * czvValue;
+    GLvoid *pvBuf;
+    GLubyte *pubBuf;
+    GLuint i;
+
+    /* quickly sort out if we can use the current value */
+    if (device->zvBuffer
+            && device->enmzvValue == enmzvValue
+            && device->czvValue >= czvValue
+            && device->czvValueElements == czvValueElements
+            && !memcmp(pzvValue, &device->zvValue, cbVal))
+        return;
+
+    if (czvValueElements > 4)
+    {
+        ERR("invalid czvValueElements %d\n", czvValueElements);
+        return;
+    }
+
+    pvBuf = HeapAlloc(GetProcessHeap(), 0, cbBuf);
+    pubBuf = (GLubyte*)pvBuf;
+
+    for (i = 0; i < czvValue; ++i)
+    {
+        memcpy(pubBuf, pzvValue, cbVal);
+        pubBuf += cbVal;
+    }
+
+    /* */
+    if (!device->zvBuffer)
+    {
+        GL_EXTCALL(glGenBuffersARB(1, &device->zvBuffer));
+        Assert(device->zvBuffer);
+    }
+
+    GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, device->zvBuffer));
+
+    if (device->cbzvBuffer < cbBuf)
+    {
+        GL_EXTCALL(glBufferDataARB(GL_ARRAY_BUFFER_ARB, cbBuf, pvBuf, GL_DYNAMIC_DRAW_ARB));
+        device->cbzvBuffer = cbBuf;
+    }
+    else
+    {
+        GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, cbBuf, pvBuf));
+    }
+
+    device->enmzvValue = enmzvValue;
+    device->czvValue = czvValue;
+    device->czvValueElements = czvValueElements;
+    memcpy(&device->zvValue, pzvValue, cbVal);
+
+    HeapFree(GetProcessHeap(), 0, pvBuf);
+}
+
+void zv_destroy(struct wined3d_device *device)
+{
+    if (device->zvBuffer)
+    {
+        const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+        GL_EXTCALL(glDeleteBuffersARB(1, &device->zvBuffer));
+    }
+
+    device->zvBuffer = 0;
+    device->cbzvBuffer = 0;
+}
+
+void zv_bind(struct wined3d_context *context, GLenum enmzvValue, GLuint czvValue, GLuint czvValueElements, GLboolean bzvNormalized, const GLvoid *pzvValue)
+{
+    struct wined3d_device *device = context->swapchain->device;
+    const struct wined3d_gl_info *gl_info = context->gl_info;
+
+    zv_create(device, enmzvValue, czvValue, czvValueElements, pzvValue);
+
+    Assert(device->zvBuffer);
+
+    GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, device->zvBuffer));
+
+    GL_EXTCALL(glVertexAttribPointerARB(0, czvValueElements,
+            enmzvValue,
+            bzvNormalized,
+            0, /*stride*/
+            NULL /*addr*/));
+
+    if (!(context->numbered_array_mask & (1 << 0)))
+    {
+        GL_EXTCALL(glEnableVertexAttribArrayARB(0));
+        context->numbered_array_mask |= (1 << 0);
+    }
+}
+
+void zv_bind_by_element(struct wined3d_context *context, const struct wined3d_stream_info_element *element, GLuint czvValue, const GLvoid *pzvValue)
+{
+    zv_bind(context, element->format->gl_vtx_type, czvValue, element->format->gl_vtx_format, element->format->gl_normalized, pzvValue);
+}
+
+#endif

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/drawprim.c

@@ -499 +499 @@
         for (i = MAX_ATTRIBS - 1; i >= 0; i--)
         {
-            if (!(si->use_map & (1 << i))) continue;
+            if (!(si->use_map & (1 << i)))
+            {
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+                if (i == 0)
+                {
+# ifdef DEBUG_misha
+                    ERR("Test it!\n");
+# endif
+                    GL_EXTCALL(glVertexAttrib4fARB(0, 0.0f, 0.0f, 0.0f, 0.0f));
+                }
+#endif
+                continue;
+            }
 
             ptr = si->elements[i].data.addr + si->elements[i].stride * SkipnStrides;
@@ -667 +679 @@
     }
 
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+    Assert(device->czvDrawVertices == 0);
+    device->czvDrawVertices = index_count;
+#endif
+
     if (!context_apply_draw_state(context, device))
     {
         context_release(context);
         WARN("Unable to apply draw state, skipping draw.\n");
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+    device->czvDrawVertices = 0;
+#endif
         return;
     }
+
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+    device->czvDrawVertices = 0;
+#endif
+
 
 #ifdef DEBUG_misha

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

@@ -4119 +4119 @@
         if (!(stream_info->use_map & (1 << i)))
         {
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+            if (i == 0)
+            {
+                GLfloat af[4] = {0., 0., 0., 0.,};
+# ifdef DEBUG_misha
+                ERR("Test it!\n");
+# endif
+                Assert(device->czvDrawVertices);
+                zv_bind(context, GL_FLOAT, device->czvDrawVertices, 4, GL_FALSE, af);
+# ifdef VBOX_WITH_WINE_FIX_CURVBO
+                /* we need to invalidate the curVBO state, since buffer_get_sysmem maay change the current buffer */
+                curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0;
+# endif
+            }
+            else
+#endif
+            {
+
             if (context->numbered_array_mask & (1 << i))
                 unload_numbered_array(context, i);
             if (state->vertex_shader->reg_maps.input_registers & (1 << i))
                 GL_EXTCALL(glVertexAttrib4fARB(i, 0.0f, 0.0f, 0.0f, 0.0f));
+
+            }
+
             continue;
         }
@@ -4190 +4211 @@
 #endif
             }
+
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+            if (i == 0)
+            {
+                Assert(device->czvDrawVertices);
+                zv_bind_by_element(context, &stream_info->elements[i], device->czvDrawVertices, ptr);
+# ifdef VBOX_WITH_WINE_FIX_CURVBO
+                /* we need to invalidate the curVBO state, since buffer_get_sysmem maay change the current buffer */
+                curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0;
+# endif
+            }
+            else
+#endif
+            {
 
             if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i);
@@ -4274 +4309 @@
                     ERR("Unexpected declaration in stride 0 attributes\n");
                     break;
+
+            }
 
             }

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

@@ -1959 +1959 @@
     UINT context_count;
 
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+    /* number of vertices in the current draw operation */
+    GLuint czvDrawVertices;
+    /* ogl 2.1 requires 0 vertattr to be present
+     * GL_ARRAY_BUFFER_ARB buffer */
+    GLuint zvBuffer;
+    /* buffer length */
+    GLuint cbzvBuffer;
+    /* current buffer value type */
+    GLenum enmzvValue;
+    /* number of values stored in the buffer currently */
+    GLuint czvValue;
+    /* number of elements in a value */
+    GLuint czvValueElements;
+    /* current buffer value */
+    union
+    {
+        GLfloat f[4];
+        GLuint ui[4];
+        GLubyte ub[4];
+        GLshort s[4];
+        GLushort us[4];
+    } zvValue;
+#endif
+
 #ifdef VBOX_WITH_WDDM
     struct VBOXUHGSMI *pHgsmi;
@@ -3025 +3050 @@
 #endif
 
+#ifdef VBOX_WITH_WINE_FIX_ZEROVERTATTR
+void zv_destroy(struct wined3d_device *device);
+void zv_bind(struct wined3d_context *context, GLenum enmzvValue, GLuint czvValue, GLuint czvValueElements, GLboolean bzvNormalized, const GLvoid *pzvValue);
+void zv_bind_by_element(struct wined3d_context *context, const struct wined3d_stream_info_element *element, GLuint czvValue, const GLvoid *pzvValue);
+#endif
+
 struct wined3d_palette
 {