gallium: Add c99_compat.h to u_bitcast.h

[mesa.git] / src / gallium / auxiliary / util / u_caps.c

diff --git a/src/gallium/auxiliary/util/u_caps.c b/src/gallium/auxiliary/util/u_caps.c
index e209a98b7066d1f79c4d6838fd5e6242a3446c67..cd005d68b3e0d66ea581d3b8d20cb5b3de61f300 100644 (file)
--- a/src/gallium/auxiliary/util/u_caps.c
+++ b/src/gallium/auxiliary/util/u_caps.c
@@ -69,8 +69,7 @@ util_check_caps_out(struct pipe_screen *screen, const unsigned *list, int *out)
                                           list[i++],
                                           PIPE_TEXTURE_2D,
                                           0,
-                                          PIPE_BIND_SAMPLER_VIEW,
-                                          0)) {
+                                          PIPE_BIND_SAMPLER_VIEW)) {
             *out = i - 2;
             return FALSE;
          }
@@ -183,7 +182,6 @@ static unsigned caps_dx_11[] = {
 
 /* OpenGL 2.1 */
 static unsigned caps_opengl_2_1[] = {
-   UTIL_CHECK_CAP(GLSL),
    UTIL_CHECK_CAP(OCCLUSION_QUERY),
    UTIL_CHECK_CAP(TWO_SIDED_STENCIL),
    UTIL_CHECK_CAP(BLEND_EQUATION_SEPARATE),
@@ -199,14 +197,12 @@ static unsigned caps_sm3[] = {
     UTIL_CHECK_SHADER(FRAGMENT, MAX_INSTRUCTIONS, 512),
     UTIL_CHECK_SHADER(FRAGMENT, MAX_INPUTS, 10),
     UTIL_CHECK_SHADER(FRAGMENT, MAX_TEMPS, 32),
-    UTIL_CHECK_SHADER(FRAGMENT, MAX_ADDRS, 1),
-    UTIL_CHECK_SHADER(FRAGMENT, MAX_CONSTS, 224),
+    UTIL_CHECK_SHADER(FRAGMENT, MAX_CONST_BUFFER_SIZE, 224 * 16),
 
     UTIL_CHECK_SHADER(VERTEX, MAX_INSTRUCTIONS, 512),
     UTIL_CHECK_SHADER(VERTEX, MAX_INPUTS, 16),
     UTIL_CHECK_SHADER(VERTEX, MAX_TEMPS, 32),
-    UTIL_CHECK_SHADER(VERTEX, MAX_ADDRS, 2),
-    UTIL_CHECK_SHADER(VERTEX, MAX_CONSTS, 256),
+    UTIL_CHECK_SHADER(VERTEX, MAX_CONST_BUFFER_SIZE, 256 * 16),
 
     UTIL_CHECK_TERMINATE
 };