OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/es: Validate FBO target enum in Mesa code rather than the ES wrapper

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick
2011-09-20 15:10:50 -07:00
parent 7e4cb32d05
commit 6dd8e76869
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3114,11 +3114,6 @@
<param name="target" type="GLenum"/> <param name="target" type="GLenum"/>
<param name="framebuffer" type="GLuint"/> <param name="framebuffer" type="GLuint"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
</template> </template>
<template name="DeleteFramebuffers"> <template name="DeleteFramebuffers">
@@ -3212,11 +3207,6 @@
<param name="renderbuffer" type="GLuint"/> <param name="renderbuffer" type="GLuint"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
<desc name="renderbuffertarget"> <desc name="renderbuffertarget">
<value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/> <value name="GL_RENDERBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_RENDERBUFFER" category="GLES2.0"/> <value name="GL_RENDERBUFFER" category="GLES2.0"/>
@@ -3233,11 +3223,6 @@
<param name="level" type="GLint"/> <param name="level" type="GLint"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
<desc name="textarget" error="GL_INVALID_OPERATION"> <desc name="textarget" error="GL_INVALID_OPERATION">
<value name="GL_TEXTURE_2D"/> <value name="GL_TEXTURE_2D"/>
<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/> <value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
@@ -3269,11 +3254,6 @@
<param name="zoffset" type="GLint"/> <param name="zoffset" type="GLint"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
<desc name="textarget" error="GL_INVALID_OPERATION"> <desc name="textarget" error="GL_INVALID_OPERATION">
<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/> <value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
</desc> </desc>
@@ -3284,11 +3264,6 @@
<return type="GLenum"/> <return type="GLenum"/>
<param name="target" type="GLenum"/> <param name="target" type="GLenum"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
</template> </template>
<template name="GetFramebufferAttachmentParameter" direction="get"> <template name="GetFramebufferAttachmentParameter" direction="get">
@@ -3300,11 +3275,6 @@
<vector name="params" type="GLtype *" size="dynamic"/> <vector name="params" type="GLtype *" size="dynamic"/>
</proto> </proto>
<desc name="target">
<value name="GL_FRAMEBUFFER_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER" category="GLES2.0"/>
</desc>
<desc name="pname"> <desc name="pname">
<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES" category="OES_framebuffer_object"/> <value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES" category="OES_framebuffer_object"/>
<value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES" category="OES_framebuffer_object"/> <value name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES" category="OES_framebuffer_object"/>

6
src/mesa/main/fbobject.c
View File

@@ -194,9 +194,11 @@ get_framebuffer_target(struct gl_context *ctx, GLenum target)
{ {
switch (target) { switch (target) {
case GL_DRAW_FRAMEBUFFER: case GL_DRAW_FRAMEBUFFER:
return ctx->Extensions.EXT_framebuffer_blit ? ctx->DrawBuffer : NULL; return ctx->Extensions.EXT_framebuffer_blit && ctx->API == API_OPENGL
? ctx->DrawBuffer : NULL;
case GL_READ_FRAMEBUFFER: case GL_READ_FRAMEBUFFER:
return ctx->Extensions.EXT_framebuffer_blit ? ctx->ReadBuffer : NULL; return ctx->Extensions.EXT_framebuffer_blit && ctx->API == API_OPENGL
? ctx->ReadBuffer : NULL;
case GL_FRAMEBUFFER_EXT: case GL_FRAMEBUFFER_EXT:
return ctx->DrawBuffer; return ctx->DrawBuffer;
default: default: