st/mesa: optimize DEPTH_STENCIL copies using fragment shader

[mesa.git] / src / mesa / vbo / vbo_attrib_tmp.h

diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index ff3304b84586538ff9a4a6a612539da7f7056e38..b2dd82e74828b7d00bf61c2e6819c595614b0b96 100644 (file)
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -32,16 +32,17 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* ATTR */
 #define ATTRI( A, N, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, GL_INT, fi_type, INT_AS_UNION(V0), INT_AS_UNION(V1), \
-        INT_AS_UNION(V2), INT_AS_UNION(V3))
+    ATTR_UNION(A, N, GL_INT, uint32_t, INT_AS_UINT(V0), INT_AS_UINT(V1), \
+        INT_AS_UINT(V2), INT_AS_UINT(V3))
 #define ATTRUI( A, N, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, GL_UNSIGNED_INT, fi_type, UINT_AS_UNION(V0), UINT_AS_UNION(V1), \
-        UINT_AS_UNION(V2), UINT_AS_UNION(V3))
+    ATTR_UNION(A, N, GL_UNSIGNED_INT, uint32_t, (uint32_t)(V0), (uint32_t)(V1), \
+        (uint32_t)(V2), (uint32_t)(V3))
 #define ATTRF( A, N, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, GL_FLOAT, fi_type, FLOAT_AS_UNION(V0), FLOAT_AS_UNION(V1),\
-        FLOAT_AS_UNION(V2), FLOAT_AS_UNION(V3))
+    ATTR_UNION(A, N, GL_FLOAT, uint32_t, FLOAT_AS_UINT(V0), FLOAT_AS_UINT(V1),\
+        FLOAT_AS_UINT(V2), FLOAT_AS_UINT(V3))
 #define ATTRD( A, N, V0, V1, V2, V3 ) \
-    ATTR_UNION(A, N, GL_DOUBLE, double, V0, V1, V2, V3)
+    ATTR_UNION(A, N, GL_DOUBLE, uint64_t, DOUBLE_AS_UINT64(V0), \
+        DOUBLE_AS_UINT64(V1), DOUBLE_AS_UINT64(V2), DOUBLE_AS_UINT64(V3))
 #define ATTRUI64( A, N, V0, V1, V2, V3 ) \
     ATTR_UNION(A, N, GL_UNSIGNED_INT64_ARB, uint64_t, V0, V1, V2, V3)