diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-05-25 16:37:29 -0400 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2018-05-30 10:06:43 +0200 |
| commit | 81bd117b3cfbdd73181e44fbedb5e42c4c492406 (patch) | |
| tree | 675ee7b905704e7defbcd7de7957f6ca3680450c | |
| parent | 714dabe3178fc141e2899ad58f421138b7fb2198 (diff) | |
| download | mesa-81bd117b3cfbdd73181e44fbedb5e42c4c492406.tar.gz | |
mesa: handle GL_UNSIGNED_INT64_ARB properly (v2)
Bindless texture handles can be passed via vertex attribs using this type.
This fixes a bunch of bindless piglit tests on radeonsi.
Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
(cherry picked from commit a8e141387686cdf44b5868031283267acb99eba7)
[Juan A. Suarez: resolve trivial conflict]
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Conflicts:
src/mesa/vbo/vbo_private.h
| -rw-r--r-- | src/mesa/main/glformats.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_context.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 1e797c24c2a..2100fcf54fe 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -563,6 +563,8 @@ _mesa_bytes_per_vertex_attrib(GLint comps, GLenum type) return sizeof(GLuint); else return -1; + case GL_UNSIGNED_INT64_ARB: + return comps * 8; default: return -1; } diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 04079b7d329..d7ebb6a3cc7 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -190,8 +190,8 @@ vbo_attrtype_to_double_flag(GLenum format) case GL_FLOAT: case GL_INT: case GL_UNSIGNED_INT: - case GL_UNSIGNED_INT64_ARB: return GL_FALSE; + case GL_UNSIGNED_INT64_ARB: case GL_DOUBLE: return GL_TRUE; default: |