Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: ppapi/shared_impl/ppb_opengles2_shared.cc

Issue 1188013004: Added support for Time Elapsed queries through the command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/shared_impl/ppb_opengles2_shared.cc
diff --git a/ppapi/shared_impl/ppb_opengles2_shared.cc b/ppapi/shared_impl/ppb_opengles2_shared.cc
index 32bb5476ec2ce70b2b175432ffc44615c7fc0b58..b1e2ca0849130216fe970dfb9344d465c9b39945 100644
--- a/ppapi/shared_impl/ppb_opengles2_shared.cc
+++ b/ppapi/shared_impl/ppb_opengles2_shared.cc
@@ -1463,6 +1463,16 @@ void GetQueryObjectuivEXT(PP_Resource context_id,
}
}
+void GetQueryObjectui64vEXT(PP_Resource context_id,
+ GLuint id,
+ GLenum pname,
+ GLuint64* params) {
+ Enter3D enter(context_id, true);
+ if (enter.succeeded()) {
+ ToGles2Impl(&enter)->GetQueryObjectui64vEXT(id, pname, params);
+ }
+}
+
void GenVertexArraysOES(PP_Resource context_id, GLsizei n, GLuint* arrays) {
Enter3D enter(context_id, true);
if (enter.succeeded()) {
@@ -1742,8 +1752,7 @@ const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() {
const PPB_OpenGLES2InstancedArrays*
PPB_OpenGLES2_Shared::GetInstancedArraysInterface() {
static const struct PPB_OpenGLES2InstancedArrays ppb_opengles2 = {
- &DrawArraysInstancedANGLE,
- &DrawElementsInstancedANGLE,
+ &DrawArraysInstancedANGLE, &DrawElementsInstancedANGLE,
&VertexAttribDivisorANGLE};
return &ppb_opengles2;
}
@@ -1768,29 +1777,21 @@ PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface() {
const PPB_OpenGLES2ChromiumMapSub*
PPB_OpenGLES2_Shared::GetChromiumMapSubInterface() {
static const struct PPB_OpenGLES2ChromiumMapSub ppb_opengles2 = {
- &MapBufferSubDataCHROMIUM,
- &UnmapBufferSubDataCHROMIUM,
- &MapTexSubImage2DCHROMIUM,
- &UnmapTexSubImage2DCHROMIUM};
+ &MapBufferSubDataCHROMIUM, &UnmapBufferSubDataCHROMIUM,
+ &MapTexSubImage2DCHROMIUM, &UnmapTexSubImage2DCHROMIUM};
return &ppb_opengles2;
}
const PPB_OpenGLES2Query* PPB_OpenGLES2_Shared::GetQueryInterface() {
static const struct PPB_OpenGLES2Query ppb_opengles2 = {
- &GenQueriesEXT,
- &DeleteQueriesEXT,
- &IsQueryEXT,
- &BeginQueryEXT,
- &EndQueryEXT,
- &GetQueryivEXT,
- &GetQueryObjectuivEXT};
+ &GenQueriesEXT, &DeleteQueriesEXT, &IsQueryEXT,
+ &BeginQueryEXT, &EndQueryEXT, &GetQueryivEXT,
+ &GetQueryObjectuivEXT, &GetQueryObjectui64vEXT};
return &ppb_opengles2;
}
const PPB_OpenGLES2VertexArrayObject*
PPB_OpenGLES2_Shared::GetVertexArrayObjectInterface() {
static const struct PPB_OpenGLES2VertexArrayObject ppb_opengles2 = {
- &GenVertexArraysOES,
- &DeleteVertexArraysOES,
- &IsVertexArrayOES,
+ &GenVertexArraysOES, &DeleteVertexArraysOES, &IsVertexArrayOES,
&BindVertexArrayOES};
return &ppb_opengles2;
}

Powered by Google App Engine
This is Rietveld 408576698