[Mesa-stable] [PATCH 12/15] Revert "mesa: Add ARB_direct_state_access checks in XFB functions"

Ian Romanick idr at freedesktop.org
Mon May 18 14:28:21 PDT 2015


From: Ian Romanick <ian.d.romanick at intel.com>

This reverts commit 7d212765a470972f4712e42caf6406b257220369.

Cc: "10.6" <mesa-stable at lists.freedesktop.org>
---
 src/mesa/main/transformfeedback.c | 42 ---------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 642fa96..103011c 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -706,13 +706,6 @@ _mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer)
    struct gl_transform_feedback_object *obj;
    struct gl_buffer_object *bufObj;
 
-   if (!ctx->Extensions.ARB_direct_state_access) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glTransformFeedbackBufferBase(GL_ARB_direct_state_access "
-                  "is not supported)");
-      return;
-   }
-
    obj = lookup_transform_feedback_object_err(ctx, xfb,
                                               "glTransformFeedbackBufferBase");
    if(!obj) {
@@ -736,13 +729,6 @@ _mesa_TransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer,
    struct gl_transform_feedback_object *obj;
    struct gl_buffer_object *bufObj;
 
-   if (!ctx->Extensions.ARB_direct_state_access) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glTransformFeedbackBufferRange(GL_ARB_direct_state_access "
-                  "is not supported)");
-      return;
-   }
-
    obj = lookup_transform_feedback_object_err(ctx, xfb,
                                               "glTransformFeedbackBufferRange");
    if(!obj) {
@@ -1059,13 +1045,6 @@ _mesa_CreateTransformFeedbacks(GLsizei n, GLuint *names)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->Extensions.ARB_direct_state_access) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glCreateTransformFeedbacks(GL_ARB_direct_state_access "
-                  "is not supported)");
-      return;
-   }
-
    create_transform_feedbacks(ctx, n, names, true);
 }
 
@@ -1236,13 +1215,6 @@ _mesa_GetTransformFeedbackiv(GLuint xfb, GLenum pname, GLint *param)
     struct gl_transform_feedback_object *obj;
     GET_CURRENT_CONTEXT(ctx);
 
-    if (!ctx->Extensions.ARB_direct_state_access) {
-       _mesa_error(ctx, GL_INVALID_OPERATION,
-                   "glGetTransformFeedbackiv(GL_ARB_direct_state_access "
-                   "is not supported)");
-       return;
-    }
-
     obj = lookup_transform_feedback_object_err(ctx, xfb,
                                                "glGetTransformFeedbackiv");
     if(!obj) {
@@ -1269,13 +1241,6 @@ _mesa_GetTransformFeedbacki_v(GLuint xfb, GLenum pname, GLuint index,
    struct gl_transform_feedback_object *obj;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->Extensions.ARB_direct_state_access) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTransformFeedbacki_v(GL_ARB_direct_state_access "
-                  "is not supported)");
-      return;
-   }
-
    obj = lookup_transform_feedback_object_err(ctx, xfb,
                                               "glGetTransformFeedbacki_v");
    if(!obj) {
@@ -1305,13 +1270,6 @@ _mesa_GetTransformFeedbacki64_v(GLuint xfb, GLenum pname, GLuint index,
    struct gl_transform_feedback_object *obj;
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!ctx->Extensions.ARB_direct_state_access) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetTransformFeedbacki64_v(GL_ARB_direct_state_access "
-                  "is not supported)");
-      return;
-   }
-
    obj = lookup_transform_feedback_object_err(ctx, xfb,
                                               "glGetTransformFeedbacki64_v");
    if(!obj) {
-- 
2.1.0



More information about the mesa-stable mailing list