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

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

Issue 1619453002: Revert of Check if internal_format is valid for GenerateMipmap(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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: 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 723f0fb4fc34451021beee4f376262b028160433..5a07d99ee79ce48e3e25029797bbca5c3a1b9ade 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -344,7 +344,7 @@
const FeatureInfo* feature_info, GLenum pname, GLfloat param);
// Makes each of the mip levels as though they were generated.
- void MarkMipmapsGenerated(const FeatureInfo* feature_info);
+ bool MarkMipmapsGenerated(const FeatureInfo* feature_info);
bool NeedsMips() const {
return min_filter_ != GL_NEAREST && min_filter_ != GL_LINEAR;
@@ -756,7 +756,8 @@
TextureRef* ref, GLenum pname, GLfloat param);
// Makes each of the mip levels as though they were generated.
- void MarkMipmapsGenerated(TextureRef* ref);
+ // Returns false if that's not allowed for the given texture.
+ bool MarkMipmapsGenerated(TextureRef* ref);
// Clears any uncleared renderable levels.
bool ClearRenderableLevels(GLES2Decoder* decoder, TextureRef* ref);

Powered by Google App Engine
This is Rietveld 408576698