diff options
| author | Samuel Pitoiset <[email protected]> | 2017-04-03 22:03:10 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-14 10:04:35 +0200 |
| commit | afb141156f09e7f2f22b88eeefe8e0800c26c1d6 (patch) | |
| tree | 5fbfd946c4ee5dcd3e29cde519e1986848680fc3 /src/mesa/vbo/vbo_attrib_tmp.h | |
| parent | 1fe7b1f9724ac38cbddcac6505d3750ef99a2eca (diff) | |
mesa: add support for unsigned 64-bit vertex attributes
This adds support in the VBO and array code to handle unsigned
64-bit vertex attributes as specified by ARB_bindless_texture.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_attrib_tmp.h')
| -rw-r--r-- | src/mesa/vbo/vbo_attrib_tmp.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h index 08b441aafbb..8328445b2b5 100644 --- a/src/mesa/vbo/vbo_attrib_tmp.h +++ b/src/mesa/vbo/vbo_attrib_tmp.h @@ -41,6 +41,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. FLOAT_AS_UNION(V2), FLOAT_AS_UNION(V3)) #define ATTRD( A, N, V0, V1, V2, V3 ) \ ATTR_UNION(A, N, GL_DOUBLE, double, V0, V1, V2, V3) +#define ATTRUI64( A, N, V0, V1, V2, V3 ) \ + ATTR_UNION(A, N, GL_UNSIGNED_INT64_ARB, uint64_t, V0, V1, V2, V3) /* float */ @@ -246,6 +248,9 @@ static inline float conv_i2_to_norm_float(const struct gl_context *ctx, int i2) #define ATTR3D( A, X, Y, Z ) ATTRD( A, 3, X, Y, Z, 1 ) #define ATTR4D( A, X, Y, Z, W ) ATTRD( A, 4, X, Y, Z, W ) +#define ATTR1UIV64( A, V ) ATTRUI64( A, 1, (V)[0], 0, 0, 0 ) +#define ATTR1UI64( A, X ) ATTRUI64( A, 1, X, 0, 0, 0 ) + static void GLAPIENTRY TAG(Vertex2f)(GLfloat x, GLfloat y) @@ -1305,11 +1310,25 @@ TAG(VertexAttribL4dv)(GLuint index, const GLdouble * v) static void GLAPIENTRY TAG(VertexAttribL1ui64ARB)(GLuint index, GLuint64EXT x) { + GET_CURRENT_CONTEXT(ctx); + if (index == 0 && _mesa_attr_zero_aliases_vertex(ctx)) + ATTR1UI64(0, x); + else if (index < MAX_VERTEX_GENERIC_ATTRIBS) + ATTR1UI64(VBO_ATTRIB_GENERIC0 + index, x); + else + ERROR(GL_INVALID_VALUE); } static void GLAPIENTRY TAG(VertexAttribL1ui64vARB)(GLuint index, const GLuint64EXT *v) { + GET_CURRENT_CONTEXT(ctx); + if (index == 0 && _mesa_attr_zero_aliases_vertex(ctx)) + ATTR1UIV64(0, v); + else if (index < MAX_VERTEX_GENERIC_ATTRIBS) + ATTR1UIV64(VBO_ATTRIB_GENERIC0 + index, v); + else + ERROR(GL_INVALID_VALUE); } #undef ATTR1FV |