KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/es: Validate glBufferData usage in Mesa code rather than the ES wrapper 

v2: Add proper core-profile and GLES3 filtering based on review feedback
from Eric Anholt.  It looks like previously there was some rebase /
merge fail.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Ian Romanick 2012-07-25 16:08:12 -07:00
parent b0b6b76d52
commit bd4e5dd355
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/APIspec.xml
View File

@ -1843,12 +1843,6 @@
<param name="data" type="const GLvoid *"/>
<param name="usage" type="GLenum"/>
</proto>
<desc name="usage">
<value name="GL_STATIC_DRAW"/>
<value name="GL_DYNAMIC_DRAW"/>
<value name="GL_STREAM_DRAW" category="GLES2.0"/>
</desc>
</template>
<template name="BufferSubData">

23
src/mesa/main/bufferobj.c
View File

@ -30,7 +30,7 @@
* \author Brian Paul, Ian Romanick
*/
#include <stdbool.h>
#include "glheader.h"
#include "enums.h"
#include "hash.h"
@ -1009,6 +1009,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
bool valid_usage;
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE & VERBOSE_API)
@ -1024,18 +1025,30 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
switch (usage) {
case GL_STREAM_DRAW_ARB:
valid_usage = (ctx->API != API_OPENGLES);
break;
case GL_STATIC_DRAW_ARB:
case GL_DYNAMIC_DRAW_ARB:
valid_usage = true;
break;
case GL_STREAM_READ_ARB:
case GL_STREAM_COPY_ARB:
case GL_STATIC_DRAW_ARB:
case GL_STATIC_READ_ARB:
case GL_STATIC_COPY_ARB:
case GL_DYNAMIC_DRAW_ARB:
case GL_DYNAMIC_READ_ARB:
case GL_DYNAMIC_COPY_ARB:
/* OK */
valid_usage = _mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx);
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
valid_usage = false;
break;
}
if (!valid_usage) {
_mesa_error(ctx, GL_INVALID_ENUM, "glBufferData(usage)");
return;
}