diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2018-05-25 16:37:29 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-05-30 16:56:47 -0700 |
| commit | e3897b667a06ea5c3760b1acc974847be035476b (patch) | |
| tree | 9c9e29fd651cdab121ff4147664a040ebca8bab2 | |
| parent | df303adc29e580f3eb27e5e787387dfe98aaa56f (diff) | |
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)
| -rw-r--r-- | src/mesa/main/glformats.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_private.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 1e797c24c2..2100fcf54f 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_private.h b/src/mesa/vbo/vbo_private.h index 589c61d675..95d67d17e5 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -97,8 +97,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: |