summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2018-02-14 22:32:59 +0100
committerMarek Olšák <marek.olsak@amd.com>2018-02-23 20:50:20 +0100
commit1defc973db3266a0ae72097951d12f8d851fed9a (patch)
treeec3fb1b7a50c23d21d2ccf5f1c609b192d648cc8
parentb8e2e9e1a1a8419f5292b0b2d9d2bdea2ce1b224 (diff)
mesa: add some of missing compatibility support for ARB_bindless_texture
The extension is exposed in the compatibility profile. Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mapi/glapi/gen/apiexec.py2
-rw-r--r--src/mesa/main/api_loopback.c8
-rw-r--r--src/mesa/main/vtxfmt.c9
3 files changed, 10 insertions, 9 deletions
diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py
index 7da0818f8a..b5e0ad4a17 100644
--- a/src/mapi/glapi/gen/apiexec.py
+++ b/src/mapi/glapi/gen/apiexec.py
@@ -291,5 +291,5 @@ functions = {
"ProgramUniform4ui64vARB": exec_info(core=31),
# GL_ARB_bindless_texture
- "GetVertexAttribLui64vARB": exec_info(core=31),
+ "GetVertexAttribLui64vARB": exec_info(compatibility=30, core=31),
}
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index b552d17d6a..4eab8118c7 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1790,6 +1790,10 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
SET_VertexAttribI4sv(dest, _mesa_VertexAttribI4sv);
SET_VertexAttribI4ubv(dest, _mesa_VertexAttribI4ubv);
SET_VertexAttribI4usv(dest, _mesa_VertexAttribI4usv);
+
+ /* GL_ARB_bindless_texture */
+ SET_VertexAttribL1ui64ARB(dest, _mesa_VertexAttribL1ui64ARB);
+ SET_VertexAttribL1ui64vARB(dest, _mesa_VertexAttribL1ui64vARB);
}
if (ctx->API == API_OPENGL_CORE) {
@@ -1803,9 +1807,5 @@ _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/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 293a385363..61629a40fd 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -205,9 +205,14 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
SET_VertexAttribP2uiv(tab, vfmt->VertexAttribP2uiv);
SET_VertexAttribP3uiv(tab, vfmt->VertexAttribP3uiv);
SET_VertexAttribP4uiv(tab, vfmt->VertexAttribP4uiv);
+
+ /* GL_ARB_bindless_texture */
+ SET_VertexAttribL1ui64ARB(tab, vfmt->VertexAttribL1ui64ARB);
+ SET_VertexAttribL1ui64vARB(tab, vfmt->VertexAttribL1ui64vARB);
}
if (ctx->API == API_OPENGL_CORE) {
+ /* GL_ARB_vertex_attrib_64bit */
SET_VertexAttribL1d(tab, vfmt->VertexAttribL1d);
SET_VertexAttribL2d(tab, vfmt->VertexAttribL2d);
SET_VertexAttribL3d(tab, vfmt->VertexAttribL3d);
@@ -217,10 +222,6 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
SET_VertexAttribL2dv(tab, vfmt->VertexAttribL2dv);
SET_VertexAttribL3dv(tab, vfmt->VertexAttribL3dv);
SET_VertexAttribL4dv(tab, vfmt->VertexAttribL4dv);
-
- /* GL_ARB_bindless_texture */
- SET_VertexAttribL1ui64ARB(tab, vfmt->VertexAttribL1ui64ARB);
- SET_VertexAttribL1ui64vARB(tab, vfmt->VertexAttribL1ui64vARB);
}
}