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

Unified Diff: ppapi/c/dev/ppb_opengles2ext_dev.h

Issue 9601020: Add OpenGL occlusion query support to pepper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update to trunk Created 8 years, 9 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/c/dev/ppb_opengles2ext_dev.h
diff --git a/ppapi/c/dev/ppb_opengles2ext_dev.h b/ppapi/c/dev/ppb_opengles2ext_dev.h
index 2aa172fabc18c8e070996711aeab19dc35357245..8c7eee38e323d22c5283186eb627a58a671338db 100644
--- a/ppapi/c/dev/ppb_opengles2ext_dev.h
+++ b/ppapi/c/dev/ppb_opengles2ext_dev.h
@@ -13,10 +13,8 @@
#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"
-#define PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE \
- PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0
+#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
dmichael (off chromium) 2012/03/16 22:15:53 Was there something wrong with the previous code?
jbauman 2012/03/16 22:19:55 This code with the NOLINT is all autogenerated by
struct PPB_OpenGLES2InstancedArrays_Dev {
void (*DrawArraysInstancedANGLE)(
@@ -29,10 +27,8 @@ struct PPB_OpenGLES2InstancedArrays_Dev {
PP_Resource context, GLuint index, GLuint divisor);
};
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0 \
- "PPB_OpenGLES2FramebufferBlit(Dev);1.0"
-#define PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE \
- PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0
+#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)(
@@ -41,10 +37,8 @@ struct PPB_OpenGLES2FramebufferBlit_Dev {
GLenum filter);
};
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0 \
- "PPB_OpenGLES2FramebufferMultisample(Dev);1.0"
-#define PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE \
- PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0
+#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)(
@@ -52,19 +46,15 @@ struct PPB_OpenGLES2FramebufferMultisample_Dev {
GLenum internalformat, GLsizei width, GLsizei height);
};
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0 \
- "PPB_OpenGLES2ChromiumEnableFeature(Dev);1.0"
-#define PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE \
- PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0
+#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"
-#define PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE \
- PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0
+#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)(
@@ -78,5 +68,21 @@ struct PPB_OpenGLES2ChromiumMapSub_Dev {
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_

Powered by Google App Engine
This is Rietveld 408576698