diff options
author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 21:38:56 +0000 |
---|---|---|
committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 21:38:56 +0000 |
commit | 36f659637c64042672f48f39b040991a145b4d7b (patch) | |
tree | a99538b0c04c5d31947904950bc8b46975dffc96 /third_party/khronos | |
parent | 0ce5cf3f048f6a859d08f4fcaba69f0975c54239 (diff) | |
download | chromium_src-36f659637c64042672f48f39b040991a145b4d7b.zip chromium_src-36f659637c64042672f48f39b040991a145b4d7b.tar.gz chromium_src-36f659637c64042672f48f39b040991a145b4d7b.tar.bz2 |
Add to the GL_CHROMIUM_gpu_memory_manager extension a
texture parameter indicating which textures are managed
and which ones aren't.
This will give the GPU memory manager precise information
about how much memory is not under its control (e.g, because
it is WebGL memory).
BUG=164947
Review URL: https://codereview.chromium.org/11517013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
-rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 12 | ||||
-rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index f1fd2c4..35a28cb9 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -2018,6 +2018,18 @@ typedef void (GL_APIENTRYP PFNGLPOSTSUBBUFFERCHROMIUM) (GLint x, GLint y, GLint #define GL_CHROMIUM_front_buffer_cached 1 #endif +/* GL_CHROMIUM_gpu_memory_manager */ +/* This extension provides a mechanism for indicating to the implementation + which textures may be discarded by the client based on the recommendations + of the implementation's memory allocation changed callback (e.g, compositor + tiles), and which texture will not be discarded (e.g, WebGL textures). */ +#ifndef GL_CHROMIUM_gpu_memory_manager +#define GL_CHROMIUM_gpu_memory_manager 1 +#define GL_TEXTURE_POOL_CHROMIUM 0x6000 +#define GL_TEXTURE_POOL_MANAGED_CHROMIUM 0x6001 +#define GL_TEXTURE_POOL_UNMANAGED_CHROMIUM 0x6002 +#endif + /* GL_ARB_robustness */ /* This extension is subsetted for the moment, incorporating only the * enums necessary to describe the reasons that we might encounter for diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 6a04ec6..7760f41 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -34,6 +34,7 @@ GLES2/gl2ext.h - Added GL_CHROMIUM_texture_from_image - Added GL_CHROMIUM_pixel_transfer_buffer_object - Added GL_CHROMIUM_async_pixel_transfers + - Added GL_CHROMIUM_gpu_memory_manager - Added GL_NVX_gpu_memory_info - Added include of gl2chromium.h EGL/eglplatform.h |