nv50: enable ARB_enhanced_layouts

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/docs/features.txt b/docs/features.txt
index ec2634f9a717ee375b7c9e15b063bb8e344ffd7d..77138087ecaecc92cc988e663140b31e6a909ed3 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -193,11 +193,11 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, radeonsi
   GL_MAX_VERTEX_ATTRIB_STRIDE                           DONE (all drivers)
   GL_ARB_buffer_storage                                 DONE (i965, nv50, nvc0, r600)
   GL_ARB_clear_texture                                  DONE (i965, nv50, nvc0, r600)
-  GL_ARB_enhanced_layouts                               DONE (i965, llvmpipe, softpipe)
+  GL_ARB_enhanced_layouts                               DONE (i965, nv50, nvc0, llvmpipe, softpipe)
   - compile-time constant expressions                   DONE
   - explicit byte offsets for blocks                    DONE
   - forced alignment within blocks                      DONE
-  - specified vec4-slot component numbers               DONE (i965, llvmpipe, softpipe)
+  - specified vec4-slot component numbers               DONE (i965, nv50, nvc0, llvmpipe, softpipe)
   - specified transform/feedback layout                 DONE
   - input/output block locations                        DONE
   GL_ARB_multi_bind                                     DONE (all drivers)

diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
index 20fd2cbe91704caffe2b47a56f7c5354346bfec4..c7e4d015c514cb0a31f74437710c170120d663ba 100644 (file)
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -51,7 +51,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_clear_texture on r600, radeonsi</li>
 <li>GL_ARB_compute_variable_group_size on nvc0, radeonsi</li>
 <li>GL_ARB_cull_distance on radeonsi</li>
-<li>GL_ARB_enhanced_layouts on i965, radeonsi, llvmpipe, softpipe</li>
+<li>GL_ARB_enhanced_layouts on i965, nv50, nvc0, radeonsi, llvmpipe, softpipe</li>
 <li>GL_ARB_indirect_parameters on radeonsi</li>
 <li>GL_ARB_query_buffer_object on radeonsi</li>
 <li>GL_ARB_shader_draw_parameters on radeonsi</li>

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 99ad90a5ab0c49da4f35884fb252681698e56f03..2901730e6e5880a3bb1771ca67698ea134e7bb51 100644 (file)
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -197,6 +197,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
    case PIPE_CAP_INVALIDATE_BUFFER:
    case PIPE_CAP_STRING_MARKER:
    case PIPE_CAP_CULL_DISTANCE:
+   case PIPE_CAP_TGSI_ARRAY_COMPONENTS:
       return 1;
    case PIPE_CAP_SEAMLESS_CUBE_MAP:
       return 1; /* class_3d >= NVA0_3D_CLASS; */
@@ -253,7 +254,6 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
    case PIPE_CAP_TGSI_VOTE:
    case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED:
    case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS:
-   case PIPE_CAP_TGSI_ARRAY_COMPONENTS:
       return 0;
 
    case PIPE_CAP_VENDOR_ID: