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

Side by Side Diff: gpu/command_buffer/service/texture_manager.h

Issue 2443123004: Revert of gpu: Clarify sized texture format is available only if ES3 context or immutable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 1 month 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 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 GLenum target, 493 GLenum target,
494 GLint level_diff, 494 GLint level_diff,
495 GLenum internal_format, 495 GLenum internal_format,
496 GLsizei width, 496 GLsizei width,
497 GLsizei height, 497 GLsizei height,
498 GLsizei depth, 498 GLsizei depth,
499 GLenum format, 499 GLenum format,
500 GLenum type); 500 GLenum type);
501 501
502 static bool ColorRenderable(const FeatureInfo* feature_info, 502 static bool ColorRenderable(const FeatureInfo* feature_info,
503 GLenum internal_format, 503 GLenum internal_format);
504 bool immutable);
505 504
506 static bool TextureFilterable(const FeatureInfo* feature_info, 505 static bool TextureFilterable(const FeatureInfo* feature_info,
507 GLenum internal_format, 506 GLenum internal_format,
508 GLenum type, 507 GLenum type);
509 bool immutable);
510 508
511 // Sets the Texture's target 509 // Sets the Texture's target
512 // Parameters: 510 // Parameters:
513 // target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or 511 // target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP or
514 // GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_RECTANGLE_ARB 512 // GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_RECTANGLE_ARB
515 // GL_TEXTURE_2D_ARRAY or GL_TEXTURE_3D (for GLES3) 513 // GL_TEXTURE_2D_ARRAY or GL_TEXTURE_3D (for GLES3)
516 // max_levels: The maximum levels this type of target can have. 514 // max_levels: The maximum levels this type of target can have.
517 void SetTarget(GLenum target, GLint max_levels); 515 void SetTarget(GLenum target, GLint max_levels);
518 516
519 // Update info about this texture. 517 // Update info about this texture.
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 private: 1254 private:
1257 DecoderTextureState* texture_state_; 1255 DecoderTextureState* texture_state_;
1258 base::TimeTicks begin_time_; 1256 base::TimeTicks begin_time_;
1259 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); 1257 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
1260 }; 1258 };
1261 1259
1262 } // namespace gles2 1260 } // namespace gles2
1263 } // namespace gpu 1261 } // namespace gpu
1264 1262
1265 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 1263 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/texture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698