Index: src/gpu/gl/GrGpuGL.cpp |
=================================================================== |
--- src/gpu/gl/GrGpuGL.cpp (revision 11006) |
+++ src/gpu/gl/GrGpuGL.cpp (working copy) |
@@ -956,19 +956,21 @@ |
} |
GL_CALL(GenTextures(1, &glTexDesc.fTextureID)); |
+ |
+ if (!glTexDesc.fTextureID) { |
+ return return_null_texture(); |
+ } |
+ |
+ this->setScratchTextureUnit(); |
+ GL_CALL(BindTexture(GR_GL_TEXTURE_2D, glTexDesc.fTextureID)); |
+ |
if (renderTarget && this->glCaps().textureUsageSupport()) { |
// provides a hint about how this texture will be used |
GL_CALL(TexParameteri(GR_GL_TEXTURE_2D, |
GR_GL_TEXTURE_USAGE, |
GR_GL_FRAMEBUFFER_ATTACHMENT)); |
} |
- if (!glTexDesc.fTextureID) { |
- return return_null_texture(); |
- } |
- this->setScratchTextureUnit(); |
- GL_CALL(BindTexture(GR_GL_TEXTURE_2D, glTexDesc.fTextureID)); |
- |
// Some drivers like to know filter/wrap before seeing glTexImage2D. Some |
// drivers have a bug where an FBO won't be complete if it includes a |
// texture that is not mipmap complete (considering the filter in use). |