Skip to content

Commit

Permalink
Move gles2 extensions out of dev.
Browse files Browse the repository at this point in the history 
BUG=none
TEST=simple usage test in nacl
Review URL: https://chromiumcodereview.appspot.com/10354004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135735 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nfullagar@google.com committed May 7, 2012
1 parent 7cc0d97 commit 2c39338
Show file tree
Hide file tree
Showing 16 changed files with 191 additions and 181 deletions.
12 changes: 6 additions & 6 deletions gpu/command_buffer/build_gles2_cmd_buffer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,12 +758,12 @@
# GL commands. 'dev' is true if it's a dev interface.
_PEPPER_INTERFACES = [
{'name': '', 'dev': False},
{'name': 'InstancedArrays', 'dev': True},
{'name': 'FramebufferBlit', 'dev': True},
{'name': 'FramebufferMultisample', 'dev': True},
{'name': 'ChromiumEnableFeature', 'dev': True},
{'name': 'ChromiumMapSub', 'dev': True},
{'name': 'Query', 'dev': True},
{'name': 'InstancedArrays', 'dev': False},
{'name': 'FramebufferBlit', 'dev': False},
{'name': 'FramebufferMultisample', 'dev': False},
{'name': 'ChromiumEnableFeature', 'dev': False},
{'name': 'ChromiumMapSub', 'dev': False},
{'name': 'Query', 'dev': False},
]

# This table specifies types and other special data for the commands that
Expand Down
4 changes: 2 additions & 2 deletions gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x00000400, "GL_STENCIL_BUFFER_BIT", },
{ 0x800A, "GL_FUNC_SUBTRACT", },
{ 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", },
{ 0x8508, "GL_DECR_WRAP", },
{ 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
{ 0x8006, "GL_FUNC_ADD", },
{ 0x8007, "GL_MIN_EXT", },
{ 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", },
Expand Down Expand Up @@ -500,7 +500,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", },
{ 0x8253, "GL_GUILTY_CONTEXT_RESET_EXT", },
{ 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", },
{ 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
{ 0x8508, "GL_DECR_WRAP", },
{ 0x8507, "GL_INCR_WRAP", },
{ 0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING", },
{ 0x8894, "GL_ARRAY_BUFFER_BINDING", },
Expand Down
10 changes: 8 additions & 2 deletions ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
#define PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE \
PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1

// This interface is deprecated. Please use
// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 instead.
// PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE is deprecated. Please use
// PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.

#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 \
"PPB_OpenGLES2ChromiumMapSub(Dev);1.0"

// PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 is also deprecated. Please
// use PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE instead.

struct PPB_GLESChromiumTextureMapping_Dev_0_1 {
// Maps the sub-image of a texture. 'level', 'xoffset', 'yoffset', 'width',
Expand Down
71 changes: 0 additions & 71 deletions ppapi/c/dev/ppb_opengles2ext_dev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,76 +13,5 @@
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/ppb_opengles2.h"

#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays(Dev);1.0" // NOLINT
#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2InstancedArrays_Dev {
void (*DrawArraysInstancedANGLE)(
PP_Resource context, GLenum mode, GLint first, GLsizei count,
GLsizei primcount);
void (*DrawElementsInstancedANGLE)(
PP_Resource context, GLenum mode, GLsizei count, GLenum type,
const void* indices, GLsizei primcount);
void (*VertexAttribDivisorANGLE)(
PP_Resource context, GLuint index, GLuint divisor);
};

#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit(Dev);1.0" // NOLINT
#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2FramebufferBlit_Dev {
void (*BlitFramebufferEXT)(
PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
GLenum filter);
};

#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample(Dev);1.0" // NOLINT
#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2FramebufferMultisample_Dev {
void (*RenderbufferStorageMultisampleEXT)(
PP_Resource context, GLenum target, GLsizei samples,
GLenum internalformat, GLsizei width, GLsizei height);
};

#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature(Dev);1.0" // NOLINT
#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2ChromiumEnableFeature_Dev {
GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
};

#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub(Dev);1.0" // NOLINT
#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2ChromiumMapSub_Dev {
void* (*MapBufferSubDataCHROMIUM)(
PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
GLenum access);
void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
void* (*MapTexSubImage2DCHROMIUM)(
PP_Resource context, GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
GLenum access);
void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
};

#define PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0 "PPB_OpenGLES2Query(Dev);1.0"
#define PPB_OPENGLES2_QUERY_DEV_INTERFACE PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0

struct PPB_OpenGLES2Query_Dev {
void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
void (*DeleteQueriesEXT)(
PP_Resource context, GLsizei n, const GLuint* queries);
GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
void (*EndQueryEXT)(PP_Resource context, GLenum target);
void (*GetQueryivEXT)(
PP_Resource context, GLenum target, GLenum pname, GLint* params);
void (*GetQueryObjectuivEXT)(
PP_Resource context, GLuint id, GLenum pname, GLuint* params);
};

#endif // C_DEV_PPB_OPENGLES2EXT_DEV_H_

71 changes: 71 additions & 0 deletions ppapi/c/ppb_opengles2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,76 @@ struct PPB_OpenGLES2 {
PP_Resource context, GLint x, GLint y, GLsizei width, GLsizei height);
};

#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0 "PPB_OpenGLES2InstancedArrays;1.0" // NOLINT
#define PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2InstancedArrays {
void (*DrawArraysInstancedANGLE)(
PP_Resource context, GLenum mode, GLint first, GLsizei count,
GLsizei primcount);
void (*DrawElementsInstancedANGLE)(
PP_Resource context, GLenum mode, GLsizei count, GLenum type,
const void* indices, GLsizei primcount);
void (*VertexAttribDivisorANGLE)(
PP_Resource context, GLuint index, GLuint divisor);
};

#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0 "PPB_OpenGLES2FramebufferBlit;1.0" // NOLINT
#define PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2FramebufferBlit {
void (*BlitFramebufferEXT)(
PP_Resource context, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask,
GLenum filter);
};

#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0 "PPB_OpenGLES2FramebufferMultisample;1.0" // NOLINT
#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2FramebufferMultisample {
void (*RenderbufferStorageMultisampleEXT)(
PP_Resource context, GLenum target, GLsizei samples,
GLenum internalformat, GLsizei width, GLsizei height);
};

#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0 "PPB_OpenGLES2ChromiumEnableFeature;1.0" // NOLINT
#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2ChromiumEnableFeature {
GLboolean (*EnableFeatureCHROMIUM)(PP_Resource context, const char* feature);
};

#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0 "PPB_OpenGLES2ChromiumMapSub;1.0" // NOLINT
#define PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE_1_0 // NOLINT

struct PPB_OpenGLES2ChromiumMapSub {
void* (*MapBufferSubDataCHROMIUM)(
PP_Resource context, GLuint target, GLintptr offset, GLsizeiptr size,
GLenum access);
void (*UnmapBufferSubDataCHROMIUM)(PP_Resource context, const void* mem);
void* (*MapTexSubImage2DCHROMIUM)(
PP_Resource context, GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type,
GLenum access);
void (*UnmapTexSubImage2DCHROMIUM)(PP_Resource context, const void* mem);
};

#define PPB_OPENGLES2_QUERY_INTERFACE_1_0 "PPB_OpenGLES2Query;1.0"
#define PPB_OPENGLES2_QUERY_INTERFACE PPB_OPENGLES2_QUERY_INTERFACE_1_0

struct PPB_OpenGLES2Query {
void (*GenQueriesEXT)(PP_Resource context, GLsizei n, GLuint* queries);
void (*DeleteQueriesEXT)(
PP_Resource context, GLsizei n, const GLuint* queries);
GLboolean (*IsQueryEXT)(PP_Resource context, GLuint id);
void (*BeginQueryEXT)(PP_Resource context, GLenum target, GLuint id);
void (*EndQueryEXT)(PP_Resource context, GLenum target);
void (*GetQueryivEXT)(
PP_Resource context, GLenum target, GLenum pname, GLint* params);
void (*GetQueryObjectuivEXT)(
PP_Resource context, GLuint id, GLenum pname, GLuint* params);
};

#endif // PPAPI_C_PPB_OPENGLES2_H_

36 changes: 18 additions & 18 deletions ppapi/lib/gl/gles2/gl2ext_ppapi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
// TODO(alokp): This will need to be thread-safe if we build gles2 as a
// shared library.
static const struct PPB_OpenGLES2* g_gles2_interface = NULL;
static const struct PPB_OpenGLES2InstancedArrays_Dev*
static const struct PPB_OpenGLES2InstancedArrays*
g_gles2_instanced_arrays_interface = NULL;
static const struct PPB_OpenGLES2FramebufferBlit_Dev*
static const struct PPB_OpenGLES2FramebufferBlit*
g_gles2_framebuffer_blit_interface = NULL;
static const struct PPB_OpenGLES2FramebufferMultisample_Dev*
static const struct PPB_OpenGLES2FramebufferMultisample*
g_gles2_framebuffer_multisample_interface = NULL;
static const struct PPB_OpenGLES2ChromiumEnableFeature_Dev*
static const struct PPB_OpenGLES2ChromiumEnableFeature*
g_gles2_chromium_enable_feature_interface = NULL;
static const struct PPB_OpenGLES2ChromiumMapSub_Dev*
static const struct PPB_OpenGLES2ChromiumMapSub*
g_gles2_chromium_map_sub_interface = NULL;
static const struct PPB_OpenGLES2Query_Dev*
static const struct PPB_OpenGLES2Query*
g_gles2_query_interface = NULL;

// TODO(alokp): Make sure PP_TLS works on all supported platforms.
Expand All @@ -49,29 +49,29 @@ GLboolean GL_APIENTRY glInitializePPAPI(
}
if (!g_gles2_instanced_arrays_interface) {
g_gles2_instanced_arrays_interface =
get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE);
get_browser_interface(PPB_OPENGLES2_INSTANCEDARRAYS_INTERFACE);
}
if (!g_gles2_framebuffer_blit_interface) {
g_gles2_framebuffer_blit_interface =
get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE);
get_browser_interface(PPB_OPENGLES2_FRAMEBUFFERBLIT_INTERFACE);
}
if (!g_gles2_framebuffer_multisample_interface) {
g_gles2_framebuffer_multisample_interface =
get_browser_interface(
PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE);
PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE);
}
if (!g_gles2_chromium_enable_feature_interface) {
g_gles2_chromium_enable_feature_interface =
get_browser_interface(
PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE);
PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE);
}
if (!g_gles2_chromium_map_sub_interface) {
g_gles2_chromium_map_sub_interface =
get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE);
get_browser_interface(PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE);
}
if (!g_gles2_query_interface) {
g_gles2_query_interface =
get_browser_interface(PPB_OPENGLES2_QUERY_DEV_INTERFACE);
get_browser_interface(PPB_OPENGLES2_QUERY_INTERFACE);
}
return g_gles2_interface ? GL_TRUE : GL_FALSE;
}
Expand All @@ -93,32 +93,32 @@ const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI() {
return g_gles2_interface;
}

const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
glGetInstancedArraysInterfacePPAPI() {
return g_gles2_instanced_arrays_interface;
}

const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
glGetFramebufferBlitInterfacePPAPI() {
return g_gles2_framebuffer_blit_interface;
}

const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
glGetFramebufferMultisampleInterfacePPAPI() {
return g_gles2_framebuffer_multisample_interface;
}

const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
glGetChromiumEnableFeatureInterfacePPAPI() {
return g_gles2_chromium_enable_feature_interface;
}

const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
glGetChromiumMapSubInterfacePPAPI() {
return g_gles2_chromium_map_sub_interface;
}

const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
const struct PPB_OpenGLES2Query* GL_APIENTRY
glGetQueryInterfacePPAPI() {
return g_gles2_query_interface;
}
12 changes: 6 additions & 6 deletions ppapi/lib/gl/gles2/gl2ext_ppapi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ GL_APICALL PP_Resource GL_APIENTRY glGetCurrentContextPPAPI();

// Returns OpenGL ES 2.0 interface.
GL_APICALL const struct PPB_OpenGLES2* GL_APIENTRY glGetInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2InstancedArrays_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2InstancedArrays* GL_APIENTRY
glGetInstancedArraysInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2FramebufferBlit_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2FramebufferBlit* GL_APIENTRY
glGetFramebufferBlitInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2FramebufferMultisample* GL_APIENTRY
glGetFramebufferMultisampleInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2ChromiumEnableFeature* GL_APIENTRY
glGetChromiumEnableFeatureInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2ChromiumMapSub* GL_APIENTRY
glGetChromiumMapSubInterfacePPAPI();
GL_APICALL const struct PPB_OpenGLES2Query_Dev* GL_APIENTRY
GL_APICALL const struct PPB_OpenGLES2Query* GL_APIENTRY
glGetQueryInterfacePPAPI();

#ifdef __cplusplus
Expand Down
Loading

0 comments on commit 2c39338

Please sign in to comment.