fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 05:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

main: Added entry point for glTransformFeedbackBufferRange

Browse source 
v2: review from Laura Ekstrand
- use the refactored code to lookup the objects
- improve some error messages
- factor out the gl method name computation
- better handle the spec differences between the DSA and non-DSA cases
- quote the spec a little more

v3: review from Laura Ekstrand
- use the new name of _mesa_lookup_bufferobj_err
- swap the comments around the offset and size checks

v4: review from Laura Ekstrand
- add more spec quotes
- properly fix the comments around the offset and size checks

v5: review from Laura Ekstrand
- add quotes on the spec citations
- revert some changes in the printf format

v6: review from Laura Ekstrand
- remove a redondant "gl" in a method name

Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
This commit is contained in:
Martin Peres 2015-01-21 12:22:11 +02:00
parent a5d165afed
commit 296d82376e
5 changed files with 94 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -20,6 +20,14 @@
<param name="buffer" type="GLuint" />
</function>
<function name="TransformFeedbackBufferRange" offset="assign">
<param name="xfb" type="GLuint" />
<param name="index" type="GLuint" />
<param name="buffer" type="GLuint" />
<param name="offset" type="GLintptr" />
<param name="size" type="GLsizeiptr" />
</function>
<!-- Buffer object functions -->
<function name="CreateBuffers" offset="assign">

3
src/mesa/main/bufferobj.c
View file

@ -3887,7 +3887,8 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
case GL_TRANSFORM_FEEDBACK_BUFFER:
_mesa_bind_buffer_range_transform_feedback(ctx,
ctx->TransformFeedback.CurrentObject,
index, bufObj, offset, size);
index, bufObj, offset, size,
false);
return;
case GL_UNIFORM_BUFFER:
bind_buffer_range_uniform_buffer(ctx, index, bufObj, offset, size);

1
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -924,6 +924,7 @@ const struct function gl_core_functions_possible[] = {
/* GL_ARB_direct_state_access */
{ "glCreateTransformFeedbacks", 45, -1 },
{ "glTransformFeedbackBufferBase", 45, -1 },
{ "glTransformFeedbackBufferRange", 45, -1 },
{ "glCreateBuffers", 45, -1 },
{ "glNamedBufferStorage", 45, -1 },
{ "glNamedBufferData", 45, -1 },

92
src/mesa/main/transformfeedback.c
View file

@ -541,7 +541,8 @@ bind_buffer_range(struct gl_context *ctx,
/**
* Specify a buffer object to receive transform feedback results. Plus,
* specify the starting offset to place the results, and max size.
* Called from the glBindBufferRange() function.
* Called from the glBindBufferRange() and glTransformFeedbackBufferRange
* functions.
*/
void
_mesa_bind_buffer_range_transform_feedback(struct gl_context *ctx,
@ -549,35 +550,74 @@ _mesa_bind_buffer_range_transform_feedback(struct gl_context *ctx,
GLuint index,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size)
GLsizeiptr size,
bool dsa)
{
const char *gl_methd_name;
if (dsa)
gl_methd_name = "glTransformFeedbackBufferRange";
else
gl_methd_name = "glBindBufferRange";
if (obj->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBindBufferRange(transform feedback active)");
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(transform feedback active)",
gl_methd_name);
return;
}
if (index >= ctx->Const.MaxTransformFeedbackBuffers) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d "
"out of bounds)", index);
/* OpenGL 4.5 core profile, 6.1, pdf page 82: "An INVALID_VALUE error is
* generated if index is greater than or equal to the number of binding
* points for transform feedback, as described in section 6.7.1."
*/
_mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%d out of bounds)",
gl_methd_name, index);
return;
}
if (size & 0x3) {
/* must a multiple of four */
_mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(size=%d)",
(int) size);
/* OpenGL 4.5 core profile, 6.7, pdf page 103: multiple of 4 */
_mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d must be a multiple of "
"four)", gl_methd_name, (int) size);
return;
}
if (offset & 0x3) {
/* must be multiple of four */
_mesa_error(ctx, GL_INVALID_VALUE,
"glBindBufferRange(offset=%d)", (int) offset);
/* OpenGL 4.5 core profile, 6.7, pdf page 103: multiple of 4 */
_mesa_error(ctx, GL_INVALID_VALUE, "%s(offset=%d must be a multiple "
"of four)", gl_methd_name, (int) offset);
return;
}
}
bind_buffer_range(ctx, obj, index, bufObj, offset, size, false);
if (offset < 0) {
/* OpenGL 4.5 core profile, 6.1, pdf page 82: "An INVALID_VALUE error is
* generated by BindBufferRange if offset is negative."
*
* OpenGL 4.5 core profile, 13.2, pdf page 445: "An INVALID_VALUE error
* is generated by TransformFeedbackBufferRange if offset is negative."
*/
_mesa_error(ctx, GL_INVALID_VALUE, "%s(offset=%d must be >= 0)",
gl_methd_name,
(int) offset);
return;
}
if (size <= 0 && (dsa || bufObj != ctx->Shared->NullBufferObj)) {
/* OpenGL 4.5 core profile, 6.1, pdf page 82: "An INVALID_VALUE error is
* generated by BindBufferRange if buffer is non-zero and size is less
* than or equal to zero."
*
* OpenGL 4.5 core profile, 13.2, pdf page 445: "An INVALID_VALUE error
* is generated by TransformFeedbackBufferRange if size is less than or
* equal to zero."
*/
_mesa_error(ctx, GL_INVALID_VALUE, "%s(size=%d must be > 0)",
gl_methd_name, (int) size);
return;
}
bind_buffer_range(ctx, obj, index, bufObj, offset, size, dsa);
}
@ -681,6 +721,30 @@ _mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer)
_mesa_bind_buffer_base_transform_feedback(ctx, obj, index, bufObj, true);
}
void GLAPIENTRY
_mesa_TransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer,
GLintptr offset, GLsizeiptr size)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_transform_feedback_object *obj;
struct gl_buffer_object *bufObj;
obj = lookup_transform_feedback_object_err(ctx, xfb,
"glTransformFeedbackBufferRange");
if(!obj) {
return;
}
bufObj = lookup_transform_feedback_bufferobj_err(ctx, buffer,
"glTransformFeedbackBufferRange");
if(!bufObj) {
return;
}
_mesa_bind_buffer_range_transform_feedback(ctx, obj, index, bufObj, offset,
size, true);
}
/**
* Specify a buffer object to receive transform feedback results, plus the
* offset in the buffer to start placing results.

6
src/mesa/main/transformfeedback.h
View file

@ -69,7 +69,7 @@ _mesa_bind_buffer_range_transform_feedback(struct gl_context *ctx,
GLuint index,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size);
GLsizeiptr size, bool dsa);
extern void
_mesa_bind_buffer_base_transform_feedback(struct gl_context *ctx,
@ -152,4 +152,8 @@ _mesa_set_transform_feedback_binding(struct gl_context *ctx,
extern void GLAPIENTRY
_mesa_TransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer);
extern void GLAPIENTRY
_mesa_TransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer,
GLintptr offset, GLsizeiptr size);
#endif /* TRANSFORM_FEEDBACK_H */