Changeset 46037 in vbox for trunk

Timestamp:

May 13, 2013 5:29:18 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: 1. missing 2.1 bits: glPointParameter GL_POINT_SPRITE_COORD_ORIGIN support; 2. Proper GL_NONE for buffers; 3. etc.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_version.h (modified) (1 diff)
• include/state/cr_point.h (modified) (2 diffs)
• state_tracker/state_bits_globalop.h (modified) (1 diff)
• state_tracker/state_buffer.c (modified) (2 diffs)
• state_tracker/state_get.txt (modified) (1 diff)
• state_tracker/state_point.c (modified) (2 diffs)
• state_tracker/state_point.txt (modified) (1 diff)
• state_tracker/state_snapshot.c (modified) (7 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h

@@ -31 +31 @@
 #define SHCROGL_SSM_VERSION_WITH_SINGLE_DEPTH_STENCIL               36
 #define SHCROGL_SSM_VERSION_WITH_PRESENT_STATE                      37
-#define SHCROGL_SSM_VERSION                                         37
+/* older state did not have glPointParameter ( GL_POINT_SPRITE_COORD_ORIGIN ) implementation */
+#define SHCROGL_SSM_VERSION_WITH_SPRITE_COORD_ORIGIN                38
+/* dirty bits are not needed for now, remove */
+#define SHCROGL_SSM_VERSION_WITHOUT_DIRTY_BITS                      38
+#define SHCROGL_SSM_VERSION                                         38
 
 /* These define the Chromium release number.

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_point.h

@@ -29 +29 @@
         CRbitvalue coordReplacement[CR_MAX_TEXTURE_UNITS][CR_MAX_BITARRAY];
 #endif
+        CRbitvalue spriteCoordOrigin[CR_MAX_BITARRAY];
         CRbitvalue dirty[CR_MAX_BITARRAY];
 } CRPointBits;
@@ -44 +45 @@
         GLboolean coordReplacement[CR_MAX_TEXTURE_UNITS];
 #endif
+    GLfloat spriteCoordOrigin;
+    GLfloat reserved; /* added to make sure alignment of sttructures following CRPointState in CRContext does not change */
 } CRPointState;
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bits_globalop.h

@@ -231 +231 @@
 }
 #endif
+#if CRSTATE_BITS_OP_VERSION >= SHCROGL_SSM_VERSION_WITH_SPRITE_COORD_ORIGIN
+_CRSTATE_BITS_OP_SIZEOF(point.spriteCoordOrigin);
+#endif
 
 _CRSTATE_BITS_OP_SIZEOF(polygon.dirty);

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_buffer.c

@@ -484 +484 @@
     {
         case GL_NONE:
+            break;
         case GL_FRONT_LEFT:
         case GL_FRONT_RIGHT:
@@ -549 +550 @@
     {
         case GL_NONE:
+            break;
         case GL_FRONT_LEFT:
         case GL_FRONT_RIGHT:

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_get.txt

@@ -81 +81 @@
 GLfloat   GL_POINT_SIZE_MAX_ARB       g->point.maxSize
 GLfloat   GL_POINT_FADE_THRESHOLD_SIZE_ARB g->point.fadeThresholdSize
+GLfloat   GL_POINT_SPRITE_COORD_ORIGIN g->point.spriteCoordOrigin
 GLfloat   GL_POINT_DISTANCE_ATTENUATION_ARB g->point.distanceAttenuation[0] g->point.distanceAttenuation[1] g->point.distanceAttenuation[2]
 GLboolean GL_NORMALIZE                g->transform.normalize

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_point.c

@@ -41 +41 @@
 #endif
 
+        p->spriteCoordOrigin = (GLfloat)GL_UPPER_LEFT;
+        RESET(pb->spriteCoordOrigin, ctx->bitid);
+
         RESET(pb->dirty, ctx->bitid);
 
@@ -168 +171 @@
                 }
                 break;
+        case GL_POINT_SPRITE_COORD_ORIGIN:
+        {
+            GLenum enmVal = (GLenum)params[0];
+        if (enmVal != GL_LOWER_LEFT && enmVal != GL_UPPER_LEFT) {
+            crStateError(__LINE__, __FILE__, GL_INVALID_VALUE, "glPointParameterfvARB invalid GL_POINT_SPRITE_COORD_ORIGIN value: %f", params[0]);
+            return;
+        }
+        p->spriteCoordOrigin = params[0];
+        DIRTY(pb->spriteCoordOrigin, g->neg_bitid);
+            break;
+        }
         default:
                 crStateError(__LINE__, __FILE__, GL_INVALID_ENUM, "glPointParameterfvARB invalid enum: %f", pname);

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_point.txt

@@ -8 +8 @@
 :maxSize:maxSize:PointParameterfARB,GL_POINT_SIZE_MAX_ARB
 :fadeThresholdSize:fadeThresholdSize:PointParameterfARB,GL_POINT_FADE_THRESHOLD_SIZE_ARB
+:spriteCoordOrigin:spriteCoordOrigin:PointParameterfARB,GL_POINT_SPRITE_COORD_ORIGIN
 #:distanceAttenuation:distanceAttenuation:PointParameterfvARB,GL_POINT_DISTANCE_ATTENUATION_ARB
 -:distanceAttenuation:*if (from->distanceAttenuation[0] != to->distanceAttenuation[0] || from->distanceAttenuation[1] != to->distanceAttenuation[1] || from->distanceAttenuation[2] != to->distanceAttenuation[2]) {

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -149 +149 @@
     SHCROGL_CUT_TAIL_ALIGNMENT(CRTextureUnit, SHCROGL_INTERNAL_LAST_FIELD);
 #undef SHCROGL_INTERNAL_LAST_FIELD
+    return rc;
+}
+
+static int crStateLoadStencilPoint_v_37(CRPointState *pPoint, PSSMHANDLE pSSM)
+{
+    int rc = VINF_SUCCESS;
+    SHCROGL_GET_STRUCT_HEAD(pPoint, CRPointState, spriteCoordOrigin);
+    pPoint->spriteCoordOrigin = (GLfloat)GL_UPPER_LEFT;
     return rc;
 }
@@ -1712 +1720 @@
 int32_t crStateSaveGlobals(PSSMHANDLE pSSM)
 {
+    /* don't need that for now */
+#if 0
     CRStateBits *pBits;
     int rc;
@@ -1725 +1735 @@
 #include "state_bits_globalop.h"
 #undef CRSTATE_BITS_OP
+#endif
     return VINF_SUCCESS;
 }
@@ -1754 +1765 @@
 #undef CRSTATE_BITS_OP_STENCIL_OP_V_33
         }
+        else if (u32Version < SHCROGL_SSM_VERSION_WITH_SPRITE_COORD_ORIGIN)
+        {
+#define CRSTATE_BITS_OP_VERSION (SHCROGL_SSM_VERSION_WITH_SPRITE_COORD_ORIGIN - 1)
+#include "state_bits_globalop.h"
+#undef CRSTATE_BITS_OP_VERSION
+        }
         else
         {
-#include "state_bits_globalop.h"
+            /* we do not put dirty bits to state anymore,
+             * nop */
+//#include "state_bits_globalop.h"
         }
 #undef CRSTATE_BITS_OP
@@ -1853 +1872 @@
             AssertRCReturn(rc, rc);
             SHCROGL_CUT_FIELD_ALIGNMENT(CRContext, attrib, buffer);
-            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, stencil);
+            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, point);
+            rc = crStateLoadStencilPoint_v_37(&pTmpContext->point, pSSM);
+            AssertRCReturn(rc, rc);
+            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, polygon, stencil);
             rc = crStateLoadStencilState_v_33(&pTmpContext->stencil, pSSM);
             AssertRCReturn(rc, rc);
@@ -1868 +1890 @@
             AssertRCReturn(rc, rc);
             SHCROGL_CUT_FIELD_ALIGNMENT(CRContext, attrib, buffer);
-            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, stencil);
+            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, point);
+            rc = crStateLoadStencilPoint_v_37(&pTmpContext->point, pSSM);
+            AssertRCReturn(rc, rc);
+            SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, polygon, stencil);
             rc = crStateLoadStencilState_v_33(&pTmpContext->stencil, pSSM);
             AssertRCReturn(rc, rc);
@@ -1884 +1909 @@
         AssertRCReturn(rc, rc);
         SHCROGL_CUT_FIELD_ALIGNMENT(CRContext, attrib, buffer);
-        SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, stencil);
+        SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, buffer, point);
+        rc = crStateLoadStencilPoint_v_37(&pTmpContext->point, pSSM);
+        AssertRCReturn(rc, rc);
+        SHCROGL_GET_STRUCT_PART(pTmpContext, CRContext, polygon, stencil);
         rc = crStateLoadStencilState_v_33(&pTmpContext->stencil, pSSM);
         AssertRCReturn(rc, rc);
         SHCROGL_CUT_FOR_OLD_TYPE_TO_ENSURE_ALIGNMENT(CRContext, stencil, CRStencilState_v_33, sizeof (void*));
         SHCROGL_GET_STRUCT_TAIL(pTmpContext, CRContext, texture);
+    }
+    else if (u32Version < SHCROGL_SSM_VERSION_WITH_SPRITE_COORD_ORIGIN)
+    {
+        SHCROGL_GET_STRUCT_HEAD(pTmpContext, CRContext, point);
+        crStateLoadStencilPoint_v_37(&pTmpContext->point, pSSM);
+        SHCROGL_GET_STRUCT_TAIL(pTmpContext, CRContext, polygon);
     }
     else