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

Side by Side Diff: gpu/GLES2/gl2extchromium.h

Issue 13613006: Add a new parameter dest_type to the GL_CHROMIUM_copy_texture extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase the patch and solve the merge conflict issue Created 7 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file contains Chromium-specific GLES2 extensions declarations. 5 // This file contains Chromium-specific GLES2 extensions declarations.
6 6
7 #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_ 7 #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_
8 #define GPU_GLES2_GL2EXTCHROMIUM_H_ 8 #define GPU_GLES2_GL2EXTCHROMIUM_H_
9 9
10 #include <GLES2/gl2.h> 10 #include <GLES2/gl2.h>
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 #ifndef GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 319 #ifndef GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM
320 #define GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 0x9242 320 #define GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 0x9242
321 #endif 321 #endif
322 322
323 #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 323 #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM
324 #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241 324 #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241
325 #endif 325 #endif
326 #ifdef GL_GLEXT_PROTOTYPES 326 #ifdef GL_GLEXT_PROTOTYPES
327 GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM( 327 GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM(
328 GLenum target, GLenum source_id, GLenum dest_id, GLint level, 328 GLenum target, GLenum source_id, GLenum dest_id, GLint level,
329 GLint internalformat); 329 GLint internalformat, GLenum dest_type);
330 #endif 330 #endif
331 typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC) ( 331 typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUMPROC) (
332 GLenum target, GLenum source_id, GLenum dest_id, GLint level, 332 GLenum target, GLenum source_id, GLenum dest_id, GLint level,
333 GLint internalformat); 333 GLint internalformat, GLenum dest_type);
334 #endif /* GL_CHROMIUM_copy_texture */ 334 #endif /* GL_CHROMIUM_copy_texture */
335 335
336 /* GL_CHROMIUM_lose_context */ 336 /* GL_CHROMIUM_lose_context */
337 #ifndef GL_CHROMIUM_lose_context 337 #ifndef GL_CHROMIUM_lose_context
338 #define GL_CHROMIUM_lose_context 1 338 #define GL_CHROMIUM_lose_context 1
339 #ifdef GL_GLEXT_PROTOTYPES 339 #ifdef GL_GLEXT_PROTOTYPES
340 GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other); 340 GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other);
341 #endif 341 #endif
342 typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) ( 342 typedef void (GL_APIENTRYP PFNGLLOSECONTEXTCHROMIUMPROC) (
343 GLenum current, GLenum other); 343 GLenum current, GLenum other);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 #endif 577 #endif
578 typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) (); 578 typedef GLuint (GL_APIENTRYP PFNGLINSERTSYNCPOINTCHROMIUMPROC) ();
579 typedef void (GL_APIENTRYP PFNGLWAITSYNCPOINTCHROMIUMPROC) (GLuint sync_point); 579 typedef void (GL_APIENTRYP PFNGLWAITSYNCPOINTCHROMIUMPROC) (GLuint sync_point);
580 #endif /* GL_CHROMIUM_sync_point */ 580 #endif /* GL_CHROMIUM_sync_point */
581 581
582 #ifdef __cplusplus 582 #ifdef __cplusplus
583 } 583 }
584 #endif 584 #endif
585 585
586 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_ 586 #endif // GPU_GLES2_GL2EXTCHROMIUM_H_
OLDNEW
« no previous file with comments | « gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt ('k') | gpu/command_buffer/client/gles2_c_lib_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698