From 4ba9be2882d9f1567809edb0a31fcdf11320d41f Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 20 Apr 2015 21:25:25 +0200
Subject: randrproto  xkeyboard-config fontconfig libX11 libXdmcp libXmu pixman
 xkbcomp xserver mesa git update 20 Apr 2015

xserver          commit b1029716e41e252f149b82124a149da180607c96
xkeyboard-config commit 7d00bcc2d9c3944bbdfcbe472ee3299729dc7687
libX11           commit 748d47e69f5c12d8557d56a8a8ec166588da7b93
libXdmcp         commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6
xkbcomp          commit 1ae525b3d236b59e6437b2b5433d460e18370973
pixman           commit 58e21d3e45c5227c2ca9ac00cf044f22a7975180
randrproto       commit 98da0d6e48b7d124d6788ea568e9f9e3dc204322
libXmu           commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62
fontconfig       commit 07be485a0a84995ce69bf60e3b1bb22cb35f6b0e
mesa             commit c1485f4b7d044724b3dbc1011f3c3a8a53132010
---
 .../src/mapi/glapi/gen/ARB_direct_state_access.xml | 118 +++++++++++++++++++++
 .../mapi/glapi/gen/ARB_program_interface_query.xml | 109 +++++++++++++++++++
 mesalib/src/mapi/glapi/gen/gl_API.xml              |   4 +-
 mesalib/src/mapi/glapi/gen/gl_genexec.py           |   1 +
 mesalib/src/mapi/stub.c                            |   2 +-
 5 files changed, 232 insertions(+), 2 deletions(-)
 create mode 100644 mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml

(limited to 'mesalib/src/mapi')

diff --git a/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml b/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 641e68f71..8a092d697 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -7,6 +7,47 @@
    <enum name="QUERY_TARGET"    value="0x82EA"/>
    <enum name="TEXTURE_BINDING" value="0x82EB"/>
 
+   <!-- Transform Feedback object functions -->
+
+  <function name="CreateTransformFeedbacks" offset="assign">
+      <param name="n" type="GLsizei" />
+      <param name="ids" type="GLuint *" />
+   </function>
+
+   <function name="TransformFeedbackBufferBase" offset="assign">
+      <param name="xfb" type="GLuint" />
+      <param name="index" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+   </function>
+
+   <function name="TransformFeedbackBufferRange" offset="assign">
+      <param name="xfb" type="GLuint" />
+      <param name="index" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+      <param name="offset" type="GLintptr" />
+      <param name="size" type="GLsizeiptr" />
+   </function>
+
+   <function name="GetTransformFeedbackiv" offset="assign">
+      <param name="xfb" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="param" type="GLint *" />
+   </function>
+
+   <function name="GetTransformFeedbacki_v" offset="assign">
+      <param name="xfb" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="index" type="GLuint" />
+      <param name="param" type="GLint *" />
+   </function>
+
+   <function name="GetTransformFeedbacki64_v" offset="assign">
+      <param name="xfb" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="index" type="GLuint" />
+      <param name="param" type="GLint64 *" />
+   </function>
+
    <!-- Buffer object functions -->
 
    <function name="CreateBuffers" offset="assign">
@@ -111,6 +152,34 @@
       <param name="data" type="GLvoid *" />
    </function>
 
+   <!-- Renderbuffer object functions -->
+
+   <function name="CreateRenderbuffers" offset="assign">
+      <param name="n" type="GLsizei" />
+      <param name="renderbuffers" type="GLuint *" />
+   </function>
+
+   <function name="NamedRenderbufferStorage" offset="assign">
+      <param name="renderbuffer" type="GLuint" />
+      <param name="internalformat" type="GLenum" />
+      <param name="width" type="GLsizei" />
+      <param name="height" type="GLsizei" />
+   </function>
+
+   <function name="NamedRenderbufferStorageMultisample" offset="assign">
+      <param name="renderbuffer" type="GLuint" />
+      <param name="samples" type="GLsizei" />
+      <param name="internalformat" type="GLenum" />
+      <param name="width" type="GLsizei" />
+      <param name="height" type="GLsizei" />
+   </function>
+
+   <function name="GetNamedRenderbufferParameteriv" offset="assign">
+      <param name="renderbuffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="params" type="GLint *" />
+   </function>
+
    <!-- Texture object functions -->
 
    <function name="CreateTextures" offset="assign">
@@ -379,5 +448,54 @@
       <param name="params" type="GLint *" />
    </function>
 
+   <!-- Sampler object functions -->
+
+   <function name="CreateSamplers" offset="assign">
+      <param name="n" type="GLsizei" />
+      <param name="samplers" type="GLuint *" />
+   </function>
+
+   <!-- Program Pipeline object functions -->
+
+   <function name="CreateProgramPipelines" offset="assign">
+      <param name="n" type="GLsizei" />
+      <param name="pipelines" type="GLuint *" />
+   </function>
+
+   <!-- Query object functions -->
+
+   <function name="CreateQueries" offset="assign">
+      <param name="target" type="GLenum" />
+      <param name="n" type="GLsizei" />
+      <param name="ids" type="GLuint *" />
+   </function>
+
+   <function name="GetQueryBufferObjectiv" offset="assign">
+      <param name="id" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="offset" type="GLintptr" />
+   </function>
+
+   <function name="GetQueryBufferObjectuiv" offset="assign">
+      <param name="id" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="offset" type="GLintptr" />
+   </function>
+
+   <function name="GetQueryBufferObjecti64v" offset="assign">
+      <param name="id" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="offset" type="GLintptr" />
+   </function>
+
+   <function name="GetQueryBufferObjectui64v" offset="assign">
+      <param name="id" type="GLuint" />
+      <param name="buffer" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="offset" type="GLintptr" />
+   </function>
 </category>
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml b/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml
new file mode 100644
index 000000000..59eb59c64
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_program_interface_query.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_program_interface_query" number="134">
+
+    <enum name="UNIFORM"                                         value="0x92E1"/>
+    <enum name="UNIFORM_BLOCK"                                   value="0x92E2"/>
+    <enum name="PROGRAM_INPUT"                                   value="0x92E3"/>
+    <enum name="PROGRAM_OUTPUT"                                  value="0x92E4"/>
+    <enum name="BUFFER_VARIABLE"                                 value="0x92E5"/>
+    <enum name="SHADER_STORAGE_BLOCK"                            value="0x92E6"/>
+    <enum name="ATOMIC_COUNTER_BUFFER"                           value="0x92C0"/>
+    <enum name="VERTEX_SUBROUTINE"                               value="0x92E8"/>
+    <enum name="TESS_CONTROL_SUBROUTINE"                         value="0x92E9"/>
+    <enum name="TESS_EVALUATION_SUBROUTINE"                      value="0x92EA"/>
+    <enum name="GEOMETRY_SUBROUTINE"                             value="0x92EB"/>
+    <enum name="FRAGMENT_SUBROUTINE"                             value="0x92EC"/>
+    <enum name="COMPUTE_SUBROUTINE"                              value="0x92ED"/>
+    <enum name="VERTEX_SUBROUTINE_UNIFORM"                       value="0x92EE"/>
+    <enum name="TESS_CONTROL_SUBROUTINE_UNIFORM"                 value="0x92EF"/>
+    <enum name="TESS_EVALUATION_SUBROUTINE_UNIFORM"              value="0x92F0"/>
+    <enum name="GEOMETRY_SUBROUTINE_UNIFORM"                     value="0x92F1"/>
+    <enum name="FRAGMENT_SUBROUTINE_UNIFORM"                     value="0x92F2"/>
+    <enum name="COMPUTE_SUBROUTINE_UNIFORM"                      value="0x92F3"/>
+    <enum name="TRANSFORM_FEEDBACK_VARYING"                      value="0x92F4"/>
+    <enum name="ACTIVE_RESOURCES"                                value="0x92F5"/>
+    <enum name="MAX_NAME_LENGTH"                                 value="0x92F6"/>
+    <enum name="MAX_NUM_ACTIVE_VARIABLES"                        value="0x92F7"/>
+    <enum name="MAX_NUM_COMPATIBLE_SUBROUTINES"                  value="0x92F8"/>
+    <enum name="NAME_LENGTH"                                     value="0x92F9"/>
+    <enum name="TYPE"                                            value="0x92FA"/>
+    <enum name="ARRAY_SIZE"                                      value="0x92FB"/>
+    <enum name="OFFSET"                                          value="0x92FC"/>
+    <enum name="BLOCK_INDEX"                                     value="0x92FD"/>
+    <enum name="ARRAY_STRIDE"                                    value="0x92FE"/>
+    <enum name="MATRIX_STRIDE"                                   value="0x92FF"/>
+    <enum name="IS_ROW_MAJOR"                                    value="0x9300"/>
+    <enum name="ATOMIC_COUNTER_BUFFER_INDEX"                     value="0x9301"/>
+    <enum name="BUFFER_BINDING"                                  value="0x9302"/>
+    <enum name="BUFFER_DATA_SIZE"                                value="0x9303"/>
+    <enum name="NUM_ACTIVE_VARIABLES"                            value="0x9304"/>
+    <enum name="ACTIVE_VARIABLES"                                value="0x9305"/>
+    <enum name="REFERENCED_BY_VERTEX_SHADER"                     value="0x9306"/>
+    <enum name="REFERENCED_BY_TESS_CONTROL_SHADER"               value="0x9307"/>
+    <enum name="REFERENCED_BY_TESS_EVALUATION_SHADER"            value="0x9308"/>
+    <enum name="REFERENCED_BY_GEOMETRY_SHADER"                   value="0x9309"/>
+    <enum name="REFERENCED_BY_FRAGMENT_SHADER"                   value="0x930A"/>
+    <enum name="REFERENCED_BY_COMPUTE_SHADER"                    value="0x930B"/>
+    <enum name="TOP_LEVEL_ARRAY_SIZE"                            value="0x930C"/>
+    <enum name="TOP_LEVEL_ARRAY_STRIDE"                          value="0x930D"/>
+    <enum name="LOCATION"                                        value="0x930E"/>
+    <enum name="LOCATION_INDEX"                                  value="0x930F"/>
+    <enum name="IS_PER_PATCH"                                    value="0x92E7"/>
+    <enum name="NUM_COMPATIBLE_SUBROUTINES"                      value="0x8E4A"/>
+    <enum name="COMPATIBLE_SUBROUTINES"                          value="0x8E4B"/>
+
+    <function name="GetProgramInterfaceiv" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="pname" type="GLenum"/>
+        <param name="params" type="GLint *" output="true"/>
+    </function>
+
+    <function name="GetProgramResourceIndex" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="name" type="const GLchar *"/>
+        <return type="GLuint"/>
+    </function>
+
+    <function name="GetProgramResourceName" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="index" type="GLuint"/>
+        <param name="bufSize" type="GLsizei "/>
+        <param name="length" type="GLsizei *" output="true"/>
+        <param name="name" type="GLchar *" output="true"/>
+    </function>
+
+    <function name="GetProgramResourceiv" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="index" type="GLuint"/>
+        <param name="propCount" type="GLsizei "/>
+        <param name="props" type="const GLenum *" output="true"/>
+        <param name="bufSize" type="GLsizei "/>
+        <param name="length" type="GLsizei *" output="true"/>
+        <param name="params" type="GLint *" output="true"/>
+    </function>
+
+    <function name="GetProgramResourceLocation" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="name" type="const GLchar *"/>
+        <return type="GLint"/>
+    </function>
+
+    <function name="GetProgramResourceLocationIndex" offset="assign">
+        <param name="program" type="GLuint"/>
+        <param name="programInterface" type="GLenum"/>
+        <param name="name" type="const GLchar *"/>
+        <return type="GLint"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 1ceb60a0f..a8a6db683 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8337,7 +8337,9 @@
 <!-- ARB extension #133 is ARB_multi_draw_indirect, defined in the same
      file as ARB_draw_indirect -->
 
-<!-- ARB extensions #134...#138 -->
+<xi:include href="ARB_program_interface_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #135...#138 -->
 
 <xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py
index d479e66da..7151f0de1 100644
--- a/mesalib/src/mapi/glapi/gen/gl_genexec.py
+++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py
@@ -92,6 +92,7 @@ header = """/**
 #include "main/pixelstore.h"
 #include "main/points.h"
 #include "main/polygon.h"
+#include "main/program_resource.h"
 #include "main/querymatrix.h"
 #include "main/queryobj.h"
 #include "main/readpix.h"
diff --git a/mesalib/src/mapi/stub.c b/mesalib/src/mapi/stub.c
index 05436bab6..45e4f7dc6 100644
--- a/mesalib/src/mapi/stub.c
+++ b/mesalib/src/mapi/stub.c
@@ -102,7 +102,7 @@ stub_add_dynamic(const char *name)
    if (!stub->addr)
       return NULL;
 
-   stub->name = (const void *) name;
+   stub->name = (const void *) strdup(name);
    /* to be fixed later */
    stub->slot = -1;
 
-- 
cgit v1.2.3