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

Unified Diff: gpu/command_buffer/service/texture_manager.h

Issue 1335873002: Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix default argument Created 5 years, 3 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
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | gpu/command_buffer/service/texture_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/texture_manager.h
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 479678cddb0ed39b0145df1bfba26b965e8ab57e..108ca08432c946b458ea70a5a88ce9edbb784be8 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -584,6 +584,8 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
enum DefaultAndBlackTextures {
kTexture2D,
+ kTexture3D,
+ kTexture2DArray,
kCubeMap,
kExternalOES,
kRectangleARB,
@@ -738,6 +740,10 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
switch (target) {
case GL_TEXTURE_2D:
return default_textures_[kTexture2D].get();
+ case GL_TEXTURE_3D:
+ return default_textures_[kTexture3D].get();
+ case GL_TEXTURE_2D_ARRAY:
+ return default_textures_[kTexture2DArray].get();
case GL_TEXTURE_CUBE_MAP:
return default_textures_[kCubeMap].get();
case GL_TEXTURE_EXTERNAL_OES:
@@ -770,6 +776,10 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
switch (target) {
case GL_SAMPLER_2D:
return black_texture_ids_[kTexture2D];
+ case GL_SAMPLER_3D:
+ return black_texture_ids_[kTexture3D];
+ case GL_SAMPLER_2D_ARRAY:
+ return black_texture_ids_[kTexture2DArray];
case GL_SAMPLER_CUBE:
return black_texture_ids_[kCubeMap];
case GL_SAMPLER_EXTERNAL_OES:
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | gpu/command_buffer/service/texture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698