Re: [Mesa-dev] [RFC PATCH 01/65] mapi: add GL_ARB_bindless_texture entry points

2017-05-23 Thread Samuel Pitoiset



On 05/22/2017 11:46 AM, Nicolai Hähnle wrote:

On 19.05.2017 18:52, Samuel Pitoiset wrote:

Signed-off-by: Samuel Pitoiset 
---
 src/mapi/glapi/gen/ARB_bindless_texture.xml | 100 


 src/mapi/glapi/gen/Makefile.am  |   1 +
 src/mapi/glapi/gen/gl_API.xml   |   4 +-
 src/mapi/glapi/gen/gl_genexec.py|   1 +
 src/mesa/Makefile.sources   |   2 +
 src/mesa/main/api_loopback.c|  14 
 src/mesa/main/api_loopback.h|   6 ++
 src/mesa/main/dd.h  |   2 +
 src/mesa/main/tests/dispatch_sanity.cpp |  18 +
 src/mesa/main/texturebindless.c |  85 
+++

 src/mesa/main/texturebindless.h |  68 +++
 src/mesa/main/uniforms.c|  24 +++
 src/mesa/main/uniforms.h|  12 
 src/mesa/main/varray.c  |   5 ++
 src/mesa/main/varray.h  |   3 +
 src/mesa/main/vtxfmt.c  |   4 ++
 src/mesa/vbo/vbo_attrib_tmp.h   |   9 +++
 src/mesa/vbo/vbo_exec_api.c |   3 +
 src/mesa/vbo/vbo_save_api.c |   3 +
 19 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 src/mapi/glapi/gen/ARB_bindless_texture.xml
 create mode 100644 src/mesa/main/texturebindless.c
 create mode 100644 src/mesa/main/texturebindless.h

diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml 
b/src/mapi/glapi/gen/ARB_bindless_texture.xml

new file mode 100644
index 00..bfad45651c
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+   
+   
+
+   


What's the offset="assign"?


It's a relic from previous rebases, it's useless, I will drop it.



Cheers,
Nicolai



+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   exec="dynamic">

+  
+  
+   
+
+   exec="dynamic">

+  
+  
+   
+
+   
+  
+  
+  
+   
+
+
+
+
diff --git a/src/mapi/glapi/gen/Makefile.am 
b/src/mapi/glapi/gen/Makefile.am

index ecd1c71175..80f9139e5d 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -119,6 +119,7 @@ API_XML = \
 gl_and_glX_API.xml \
 ARB_base_instance.xml \
 ARB_blend_func_extended.xml \
+ARB_bindless_texture.xml \
 ARB_clear_buffer_object.xml \
 ARB_clear_texture.xml \
 ARB_clip_control.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml 
b/src/mapi/glapi/gen/gl_API.xml

index 762fb5a676..278fe14bb6 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8284,7 +8284,9 @@
 
 

-
+
+
+xmlns:xi="http://www.w3.org/2001/XInclude"/>


 xmlns:xi="http://www.w3.org/2001/XInclude"/>


diff --git a/src/mapi/glapi/gen/gl_genexec.py 
b/src/mapi/glapi/gen/gl_genexec.py

index 37b1cc6be0..57e155bd1f 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -113,6 +113,7 @@ header = """/**
 #include "main/texstate.h"
 #include "main/texstorage.h"
 #include "main/barrier.h"
+#include "main/texturebindless.h"
 #include "main/textureview.h"
 #include "main/transformfeedback.h"
 #include "main/mtypes.h"
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 8a65fbe663..b80882fb8d 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -240,6 +240,8 @@ MAIN_FILES = \
 main/texstorage.h \
 main/texstore.c \
 main/texstore.h \
+main/texturebindless.c \
+main/texturebindless.h \
 main/textureview.c \
 main/textureview.h \
 main/transformfeedback.c \
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 59b59d3a9e..36e5194b93 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1529,6 +1529,16 @@ _mesa_VertexAttribL1dv(GLuint index, const 
GLdouble *v)

 }

 void GLAPIENTRY
+_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x)
+{
+}
+
+void GLAPIENTRY
+_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v)
+{
+}
+
+void GLAPIENTRY
 _mesa_VertexAttribL2dv(GLuint index, const GLdouble *v)
 {
ATTRIB2_D(index, v[0], v[1]);
@@ -1789,5 +1799,9 @@ _mesa_loopback_init_api_table(const struct 
gl_context *ctx,

   SET_VertexAttribL2dv(dest, _mesa_VertexAttribL2dv);
   SET_VertexAttribL3dv(dest, _mesa_VertexAttribL3dv);
   SET_VertexAttribL4dv(dest, _mesa_VertexAttribL4dv);
+
+  /* GL_ARB_bindless_texture */
+  SET_VertexAttribL1ui64ARB(dest, _mesa_VertexAttribL1ui64ARB);
+  SET_VertexAttribL1ui64vARB(dest, 

Re: [Mesa-dev] [RFC PATCH 01/65] mapi: add GL_ARB_bindless_texture entry points

2017-05-22 Thread Nicolai Hähnle

On 19.05.2017 18:52, Samuel Pitoiset wrote:

Signed-off-by: Samuel Pitoiset 
---
 src/mapi/glapi/gen/ARB_bindless_texture.xml | 100 
 src/mapi/glapi/gen/Makefile.am  |   1 +
 src/mapi/glapi/gen/gl_API.xml   |   4 +-
 src/mapi/glapi/gen/gl_genexec.py|   1 +
 src/mesa/Makefile.sources   |   2 +
 src/mesa/main/api_loopback.c|  14 
 src/mesa/main/api_loopback.h|   6 ++
 src/mesa/main/dd.h  |   2 +
 src/mesa/main/tests/dispatch_sanity.cpp |  18 +
 src/mesa/main/texturebindless.c |  85 +++
 src/mesa/main/texturebindless.h |  68 +++
 src/mesa/main/uniforms.c|  24 +++
 src/mesa/main/uniforms.h|  12 
 src/mesa/main/varray.c  |   5 ++
 src/mesa/main/varray.h  |   3 +
 src/mesa/main/vtxfmt.c  |   4 ++
 src/mesa/vbo/vbo_attrib_tmp.h   |   9 +++
 src/mesa/vbo/vbo_exec_api.c |   3 +
 src/mesa/vbo/vbo_save_api.c |   3 +
 19 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 src/mapi/glapi/gen/ARB_bindless_texture.xml
 create mode 100644 src/mesa/main/texturebindless.c
 create mode 100644 src/mesa/main/texturebindless.h

diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml 
b/src/mapi/glapi/gen/ARB_bindless_texture.xml
new file mode 100644
index 00..bfad45651c
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+   
+   
+
+   


What's the offset="assign"?

Cheers,
Nicolai



+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+
+
+
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index ecd1c71175..80f9139e5d 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -119,6 +119,7 @@ API_XML = \
gl_and_glX_API.xml \
ARB_base_instance.xml \
ARB_blend_func_extended.xml \
+   ARB_bindless_texture.xml \
ARB_clear_buffer_object.xml \
ARB_clear_texture.xml \
ARB_clip_control.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 762fb5a676..278fe14bb6 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8284,7 +8284,9 @@
 
 

-
+
+
+http://www.w3.org/2001/XInclude"/>

 http://www.w3.org/2001/XInclude"/>

diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 37b1cc6be0..57e155bd1f 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -113,6 +113,7 @@ header = """/**
 #include "main/texstate.h"
 #include "main/texstorage.h"
 #include "main/barrier.h"
+#include "main/texturebindless.h"
 #include "main/textureview.h"
 #include "main/transformfeedback.h"
 #include "main/mtypes.h"
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 8a65fbe663..b80882fb8d 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -240,6 +240,8 @@ MAIN_FILES = \
main/texstorage.h \
main/texstore.c \
main/texstore.h \
+   main/texturebindless.c \
+   main/texturebindless.h \
main/textureview.c \
main/textureview.h \
main/transformfeedback.c \
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 59b59d3a9e..36e5194b93 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1529,6 +1529,16 @@ _mesa_VertexAttribL1dv(GLuint index, const GLdouble *v)
 }

 void GLAPIENTRY
+_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x)
+{
+}
+
+void GLAPIENTRY
+_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v)
+{
+}
+
+void GLAPIENTRY
 _mesa_VertexAttribL2dv(GLuint index, const GLdouble *v)
 {
ATTRIB2_D(index, v[0], v[1]);
@@ -1789,5 +1799,9 @@ _mesa_loopback_init_api_table(const struct gl_context 
*ctx,
   SET_VertexAttribL2dv(dest, _mesa_VertexAttribL2dv);
   SET_VertexAttribL3dv(dest, _mesa_VertexAttribL3dv);
   SET_VertexAttribL4dv(dest, _mesa_VertexAttribL4dv);
+
+  /* GL_ARB_bindless_texture */
+  SET_VertexAttribL1ui64ARB(dest, _mesa_VertexAttribL1ui64ARB);
+  SET_VertexAttribL1ui64vARB(dest, _mesa_VertexAttribL1ui64vARB);
}
 }
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 026bfd68e1..c1e7b24f09 100644
--- 

[Mesa-dev] [RFC PATCH 01/65] mapi: add GL_ARB_bindless_texture entry points

2017-05-19 Thread Samuel Pitoiset
Signed-off-by: Samuel Pitoiset 
---
 src/mapi/glapi/gen/ARB_bindless_texture.xml | 100 
 src/mapi/glapi/gen/Makefile.am  |   1 +
 src/mapi/glapi/gen/gl_API.xml   |   4 +-
 src/mapi/glapi/gen/gl_genexec.py|   1 +
 src/mesa/Makefile.sources   |   2 +
 src/mesa/main/api_loopback.c|  14 
 src/mesa/main/api_loopback.h|   6 ++
 src/mesa/main/dd.h  |   2 +
 src/mesa/main/tests/dispatch_sanity.cpp |  18 +
 src/mesa/main/texturebindless.c |  85 +++
 src/mesa/main/texturebindless.h |  68 +++
 src/mesa/main/uniforms.c|  24 +++
 src/mesa/main/uniforms.h|  12 
 src/mesa/main/varray.c  |   5 ++
 src/mesa/main/varray.h  |   3 +
 src/mesa/main/vtxfmt.c  |   4 ++
 src/mesa/vbo/vbo_attrib_tmp.h   |   9 +++
 src/mesa/vbo/vbo_exec_api.c |   3 +
 src/mesa/vbo/vbo_save_api.c |   3 +
 19 files changed, 363 insertions(+), 1 deletion(-)
 create mode 100644 src/mapi/glapi/gen/ARB_bindless_texture.xml
 create mode 100644 src/mesa/main/texturebindless.c
 create mode 100644 src/mesa/main/texturebindless.h

diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml 
b/src/mapi/glapi/gen/ARB_bindless_texture.xml
new file mode 100644
index 00..bfad45651c
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+   
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+   
+  
+  
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+  
+  
+  
+   
+
+
+
+
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index ecd1c71175..80f9139e5d 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -119,6 +119,7 @@ API_XML = \
gl_and_glX_API.xml \
ARB_base_instance.xml \
ARB_blend_func_extended.xml \
+   ARB_bindless_texture.xml \
ARB_clear_buffer_object.xml \
ARB_clear_texture.xml \
ARB_clip_control.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 762fb5a676..278fe14bb6 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8284,7 +8284,9 @@
 
 
 
-
+
+
+http://www.w3.org/2001/XInclude"/>
 
 http://www.w3.org/2001/XInclude"/>
 
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 37b1cc6be0..57e155bd1f 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -113,6 +113,7 @@ header = """/**
 #include "main/texstate.h"
 #include "main/texstorage.h"
 #include "main/barrier.h"
+#include "main/texturebindless.h"
 #include "main/textureview.h"
 #include "main/transformfeedback.h"
 #include "main/mtypes.h"
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 8a65fbe663..b80882fb8d 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -240,6 +240,8 @@ MAIN_FILES = \
main/texstorage.h \
main/texstore.c \
main/texstore.h \
+   main/texturebindless.c \
+   main/texturebindless.h \
main/textureview.c \
main/textureview.h \
main/transformfeedback.c \
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 59b59d3a9e..36e5194b93 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1529,6 +1529,16 @@ _mesa_VertexAttribL1dv(GLuint index, const GLdouble *v)
 }
 
 void GLAPIENTRY
+_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x)
+{
+}
+
+void GLAPIENTRY
+_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v)
+{
+}
+
+void GLAPIENTRY
 _mesa_VertexAttribL2dv(GLuint index, const GLdouble *v)
 {
ATTRIB2_D(index, v[0], v[1]);
@@ -1789,5 +1799,9 @@ _mesa_loopback_init_api_table(const struct gl_context 
*ctx,
   SET_VertexAttribL2dv(dest, _mesa_VertexAttribL2dv);
   SET_VertexAttribL3dv(dest, _mesa_VertexAttribL3dv);
   SET_VertexAttribL4dv(dest, _mesa_VertexAttribL4dv);
+
+  /* GL_ARB_bindless_texture */
+  SET_VertexAttribL1ui64ARB(dest, _mesa_VertexAttribL1ui64ARB);
+  SET_VertexAttribL1ui64vARB(dest, _mesa_VertexAttribL1ui64vARB);
}
 }
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 026bfd68e1..c1e7b24f09 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -481,4 +481,10 @@ void