diff options
author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:56:35 +0000 |
---|---|---|
committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:56:35 +0000 |
commit | 2c39338321bfcd99727813c9ae55f8ad4927b5df (patch) | |
tree | 1eea41b63b3287bf2fc47f895e9609d72b25b692 /ppapi/shared_impl | |
parent | 7cc0d975aa61af7374044c7d8ae489a54915c15d (diff) | |
download | chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.zip chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.tar.gz chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.tar.bz2 |
Move gles2 extensions out of dev.
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
Diffstat (limited to 'ppapi/shared_impl')
-rw-r--r-- | ppapi/shared_impl/ppb_opengles2_shared.cc | 24 | ||||
-rw-r--r-- | ppapi/shared_impl/ppb_opengles2_shared.h | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ppapi/shared_impl/ppb_opengles2_shared.cc b/ppapi/shared_impl/ppb_opengles2_shared.cc index 52755cf..03db463 100644 --- a/ppapi/shared_impl/ppb_opengles2_shared.cc +++ b/ppapi/shared_impl/ppb_opengles2_shared.cc @@ -988,34 +988,34 @@ const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() { }; return &ppb_opengles2; } -const PPB_OpenGLES2InstancedArrays_Dev* PPB_OpenGLES2_Shared::GetInstancedArraysInterface() { // NOLINT - static const struct PPB_OpenGLES2InstancedArrays_Dev ppb_opengles2 = { +const PPB_OpenGLES2InstancedArrays* PPB_OpenGLES2_Shared::GetInstancedArraysInterface() { // NOLINT + static const struct PPB_OpenGLES2InstancedArrays ppb_opengles2 = { &DrawArraysInstancedANGLE, &DrawElementsInstancedANGLE, &VertexAttribDivisorANGLE }; return &ppb_opengles2; } -const PPB_OpenGLES2FramebufferBlit_Dev* PPB_OpenGLES2_Shared::GetFramebufferBlitInterface() { // NOLINT - static const struct PPB_OpenGLES2FramebufferBlit_Dev ppb_opengles2 = { +const PPB_OpenGLES2FramebufferBlit* PPB_OpenGLES2_Shared::GetFramebufferBlitInterface() { // NOLINT + static const struct PPB_OpenGLES2FramebufferBlit ppb_opengles2 = { &BlitFramebufferEXT }; return &ppb_opengles2; } -const PPB_OpenGLES2FramebufferMultisample_Dev* PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface() { // NOLINT - static const struct PPB_OpenGLES2FramebufferMultisample_Dev ppb_opengles2 = { +const PPB_OpenGLES2FramebufferMultisample* PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface() { // NOLINT + static const struct PPB_OpenGLES2FramebufferMultisample ppb_opengles2 = { &RenderbufferStorageMultisampleEXT }; return &ppb_opengles2; } -const PPB_OpenGLES2ChromiumEnableFeature_Dev* PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() { // NOLINT - static const struct PPB_OpenGLES2ChromiumEnableFeature_Dev ppb_opengles2 = { +const PPB_OpenGLES2ChromiumEnableFeature* PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() { // NOLINT + static const struct PPB_OpenGLES2ChromiumEnableFeature ppb_opengles2 = { &EnableFeatureCHROMIUM }; return &ppb_opengles2; } -const PPB_OpenGLES2ChromiumMapSub_Dev* PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() { // NOLINT - static const struct PPB_OpenGLES2ChromiumMapSub_Dev ppb_opengles2 = { +const PPB_OpenGLES2ChromiumMapSub* PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() { // NOLINT + static const struct PPB_OpenGLES2ChromiumMapSub ppb_opengles2 = { &MapBufferSubDataCHROMIUM, &UnmapBufferSubDataCHROMIUM, &MapTexSubImage2DCHROMIUM, @@ -1023,8 +1023,8 @@ const PPB_OpenGLES2ChromiumMapSub_Dev* PPB_OpenGLES2_Shared::GetChromiumMapSubIn }; return &ppb_opengles2; } -const PPB_OpenGLES2Query_Dev* PPB_OpenGLES2_Shared::GetQueryInterface() { - static const struct PPB_OpenGLES2Query_Dev ppb_opengles2 = { +const PPB_OpenGLES2Query* PPB_OpenGLES2_Shared::GetQueryInterface() { + static const struct PPB_OpenGLES2Query ppb_opengles2 = { &GenQueriesEXT, &DeleteQueriesEXT, &IsQueryEXT, diff --git a/ppapi/shared_impl/ppb_opengles2_shared.h b/ppapi/shared_impl/ppb_opengles2_shared.h index 8f037b7..8e25dfa 100644 --- a/ppapi/shared_impl/ppb_opengles2_shared.h +++ b/ppapi/shared_impl/ppb_opengles2_shared.h @@ -14,14 +14,14 @@ namespace ppapi { class PPAPI_SHARED_EXPORT PPB_OpenGLES2_Shared { public: static const PPB_OpenGLES2* GetInterface(); - static const PPB_OpenGLES2InstancedArrays_Dev* GetInstancedArraysInterface(); - static const PPB_OpenGLES2FramebufferBlit_Dev* GetFramebufferBlitInterface(); - static const PPB_OpenGLES2FramebufferMultisample_Dev* + static const PPB_OpenGLES2InstancedArrays* GetInstancedArraysInterface(); + static const PPB_OpenGLES2FramebufferBlit* GetFramebufferBlitInterface(); + static const PPB_OpenGLES2FramebufferMultisample* GetFramebufferMultisampleInterface(); - static const PPB_OpenGLES2ChromiumEnableFeature_Dev* + static const PPB_OpenGLES2ChromiumEnableFeature* GetChromiumEnableFeatureInterface(); - static const PPB_OpenGLES2ChromiumMapSub_Dev* GetChromiumMapSubInterface(); - static const PPB_OpenGLES2Query_Dev* GetQueryInterface(); + static const PPB_OpenGLES2ChromiumMapSub* GetChromiumMapSubInterface(); + static const PPB_OpenGLES2Query* GetQueryInterface(); }; } // namespace ppapi |