Chromium Code Reviews| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc |
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc |
| index 0a61662c3349e6d18e2bd1f420680f5de43c7f9a..625282c4032f4879228dd09157dec55733065abb 100644 |
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc |
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_opengles.cc |
| @@ -645,6 +645,31 @@ void RenderbufferStorageMultisampleEXT( |
| context)->RenderbufferStorageMultisampleEXT( |
| target, samples, internalformat, width, height); |
| } |
| +void GenQueriesEXT(PP_Resource context, GLsizei n, GLuint* queries) { |
| + PluginGraphics3D::implFromResource(context)->GenQueriesEXT(n, queries); |
| +} |
| +void DeleteQueriesEXT(PP_Resource context, GLsizei n, const GLuint* queries) { |
| + PluginGraphics3D::implFromResource(context)->DeleteQueriesEXT(n, queries); |
| +} |
| +GLboolean IsQueryEXT(PP_Resource context, GLuint id) { |
| + return PluginGraphics3D::implFromResource(context)->IsQueryEXT(id); |
| +} |
| +void BeginQueryEXT(PP_Resource context, GLenum target, GLuint id) { |
| + PluginGraphics3D::implFromResource(context)->BeginQueryEXT(target, id); |
| +} |
| +void EndQueryEXT(PP_Resource context, GLenum target) { |
| + PluginGraphics3D::implFromResource(context)->EndQueryEXT(target); |
| +} |
| +void GetQueryivEXT( |
| + PP_Resource context, GLenum target, GLenum pname, GLint* params) { |
| + PluginGraphics3D::implFromResource( |
| + context)->GetQueryivEXT(target, pname, params); |
| +} |
| +void GetQueryObjectuivEXT( |
| + PP_Resource context, GLuint id, GLenum pname, GLuint* params) { |
| + PluginGraphics3D::implFromResource( |
| + context)->GetQueryObjectuivEXT(id, pname, params); |
| +} |
| GLboolean EnableFeatureCHROMIUM(PP_Resource context, const char* feature) { |
| return PluginGraphics3D::implFromResource( |
| context)->EnableFeatureCHROMIUM(feature); |
| @@ -838,8 +863,7 @@ const PPB_OpenGLES2* PluginGraphics3D::GetOpenGLESInterface() { |
| }; |
| return &ppb_opengles; |
| } |
| -const PPB_OpenGLES2InstancedArrays_Dev* |
| - PluginGraphics3D::GetOpenGLESInstancedArraysInterface() { |
| +const PPB_OpenGLES2InstancedArrays_Dev* PluginGraphics3D::GetOpenGLESInstancedArraysInterface() { // NOLINT |
|
dmichael (off chromium)
2012/03/16 22:15:53
same comment as before about >80 chars.
|
| const static struct PPB_OpenGLES2InstancedArrays_Dev ppb_opengles = { |
| &DrawArraysInstancedANGLE, |
| &DrawElementsInstancedANGLE, |
| @@ -847,29 +871,25 @@ const PPB_OpenGLES2InstancedArrays_Dev* |
| }; |
| return &ppb_opengles; |
| } |
| -const PPB_OpenGLES2FramebufferBlit_Dev* |
| - PluginGraphics3D::GetOpenGLESFramebufferBlitInterface() { |
| +const PPB_OpenGLES2FramebufferBlit_Dev* PluginGraphics3D::GetOpenGLESFramebufferBlitInterface() { // NOLINT |
| const static struct PPB_OpenGLES2FramebufferBlit_Dev ppb_opengles = { |
| &BlitFramebufferEXT |
| }; |
| return &ppb_opengles; |
| } |
| -const PPB_OpenGLES2FramebufferMultisample_Dev* |
| - PluginGraphics3D::GetOpenGLESFramebufferMultisampleInterface() { |
| +const PPB_OpenGLES2FramebufferMultisample_Dev* PluginGraphics3D::GetOpenGLESFramebufferMultisampleInterface() { // NOLINT |
| const static struct PPB_OpenGLES2FramebufferMultisample_Dev ppb_opengles = { |
| &RenderbufferStorageMultisampleEXT |
| }; |
| return &ppb_opengles; |
| } |
| -const PPB_OpenGLES2ChromiumEnableFeature_Dev* |
| - PluginGraphics3D::GetOpenGLESChromiumEnableFeatureInterface() { |
| +const PPB_OpenGLES2ChromiumEnableFeature_Dev* PluginGraphics3D::GetOpenGLESChromiumEnableFeatureInterface() { // NOLINT |
| const static struct PPB_OpenGLES2ChromiumEnableFeature_Dev ppb_opengles = { |
| &EnableFeatureCHROMIUM |
| }; |
| return &ppb_opengles; |
| } |
| -const PPB_OpenGLES2ChromiumMapSub_Dev* |
| - PluginGraphics3D::GetOpenGLESChromiumMapSubInterface() { |
| +const PPB_OpenGLES2ChromiumMapSub_Dev* PluginGraphics3D::GetOpenGLESChromiumMapSubInterface() { // NOLINT |
| const static struct PPB_OpenGLES2ChromiumMapSub_Dev ppb_opengles = { |
| &MapBufferSubDataCHROMIUM, |
| &UnmapBufferSubDataCHROMIUM, |
| @@ -878,3 +898,15 @@ const PPB_OpenGLES2ChromiumMapSub_Dev* |
| }; |
| return &ppb_opengles; |
| } |
| +const PPB_OpenGLES2Query_Dev* PluginGraphics3D::GetOpenGLESQueryInterface() { |
| + const static struct PPB_OpenGLES2Query_Dev ppb_opengles = { |
| + &GenQueriesEXT, |
| + &DeleteQueriesEXT, |
| + &IsQueryEXT, |
| + &BeginQueryEXT, |
| + &EndQueryEXT, |
| + &GetQueryivEXT, |
| + &GetQueryObjectuivEXT |
| + }; |
| + return &ppb_opengles; |
| +} |