Fix mipmap generation on undefined cube texture

[android-x86/external-swiftshader.git] / src / OpenGL / libGLESv2 / libGLESv2.cpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index a58563e..86ebabb 100644 (file)
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -2108,35 +2108,11 @@ void GenerateMipmap(GLenum target)
 
        if(context)
        {
-               es2::Texture *texture = nullptr;
+               es2::Texture *texture = context->getTargetTexture(target);
 
-               switch(target)
+               if(!texture)
                {
-               case GL_TEXTURE_2D:
-                       texture = context->getTexture2D();
-                       break;
-               case GL_TEXTURE_CUBE_MAP:
-                       {
-                               TextureCubeMap *cube = context->getTextureCubeMap();
-                               texture = cube;
-
-                               if(!cube->isCubeComplete())
-                               {
-                                       return error(GL_INVALID_OPERATION);
-                               }
-                       }
-                       break;
-               case GL_TEXTURE_2D_ARRAY:
-                       texture = context->getTexture2DArray();
-                       break;
-               case GL_TEXTURE_3D:
-                       texture = context->getTexture3D();
-                       break;
-               case GL_TEXTURE_RECTANGLE_ARB:
-                       texture = context->getTexture2DRect();
-                       break;
-               default:
-                       return error(GL_INVALID_ENUM);
+                       return;
                }
 
                if(!IsMipmappable(texture->getFormat(target, texture->getBaseLevel())))
@@ -2144,6 +2120,23 @@ void GenerateMipmap(GLenum target)
                        return error(GL_INVALID_OPERATION);
                }
 
+               if(target == GL_TEXTURE_CUBE_MAP)
+               {
+                       TextureCubeMap *cube = context->getTextureCubeMap();
+
+                       if(!cube->isCubeComplete())
+                       {
+                               return error(GL_INVALID_OPERATION);
+                       }
+               }
+
+               // [OpenGL ES 3.2]: "Otherwise, if levelbase is not defined, or if any dimension
+               // is zero, all mipmap levels are left unchanged. This is not an error."
+               if(!texture->isBaseLevelDefined())
+               {
+                       return;
+               }
+
                texture->generateMipmaps();
        }
 }
@@ -3296,18 +3289,11 @@ void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
 
        if(context)
        {
-               es2::Texture *texture;
+               es2::Texture *texture = context->getTargetTexture(target);
 
-               switch(target)
+               if(!texture)
                {
-               case GL_TEXTURE_2D:            texture = context->getTexture2D();       break;
-               case GL_TEXTURE_2D_ARRAY:      texture = context->getTexture2DArray();  break;
-               case GL_TEXTURE_3D:            texture = context->getTexture3D();       break;
-               case GL_TEXTURE_CUBE_MAP:      texture = context->getTextureCubeMap();  break;
-               case GL_TEXTURE_EXTERNAL_OES:  texture = context->getTextureExternal(); break;
-               case GL_TEXTURE_RECTANGLE_ARB: texture = context->getTexture2DRect();   break;
-               default:
-                       return error(GL_INVALID_ENUM);
+                       return;
                }
 
                switch(pname)
@@ -3383,18 +3369,11 @@ void GetTexParameteriv(GLenum target, GLenum pname, GLint* params)
 
        if(context)
        {
-               es2::Texture *texture;
+               es2::Texture *texture = context->getTargetTexture(target);
 
-               switch(target)
+               if(!texture)
                {
-               case GL_TEXTURE_2D:            texture = context->getTexture2D();       break;
-               case GL_TEXTURE_2D_ARRAY:      texture = context->getTexture2DArray();  break;
-               case GL_TEXTURE_3D:            texture = context->getTexture3D();       break;
-               case GL_TEXTURE_CUBE_MAP:      texture = context->getTextureCubeMap();  break;
-               case GL_TEXTURE_EXTERNAL_OES:  texture = context->getTextureExternal(); break;
-               case GL_TEXTURE_RECTANGLE_ARB: texture = context->getTexture2DRect();   break;
-               default:
-                       return error(GL_INVALID_ENUM);
+                       return;
                }
 
                switch(pname)
@@ -4655,18 +4634,11 @@ void TexParameterf(GLenum target, GLenum pname, GLfloat param)
 
        if(context)
        {
-               es2::Texture *texture;
+               es2::Texture *texture = context->getTargetTexture(target);
 
-               switch(target)
+               if(!texture)
                {
-               case GL_TEXTURE_2D:            texture = context->getTexture2D();       break;
-               case GL_TEXTURE_2D_ARRAY:      texture = context->getTexture2DArray();  break;
-               case GL_TEXTURE_3D:            texture = context->getTexture3D();       break;
-               case GL_TEXTURE_CUBE_MAP:      texture = context->getTextureCubeMap();  break;
-               case GL_TEXTURE_EXTERNAL_OES:  texture = context->getTextureExternal(); break;
-               case GL_TEXTURE_RECTANGLE_ARB: texture = context->getTexture2DRect();   break;
-               default:
-                       return error(GL_INVALID_ENUM);
+                       return;
                }
 
                switch(pname)
@@ -4786,18 +4758,11 @@ void TexParameteri(GLenum target, GLenum pname, GLint param)
 
        if(context)
        {
-               es2::Texture *texture;
+               es2::Texture *texture = context->getTargetTexture(target);
 
-               switch(target)
+               if(!texture)
                {
-               case GL_TEXTURE_2D:            texture = context->getTexture2D();       break;
-               case GL_TEXTURE_2D_ARRAY:      texture = context->getTexture2DArray();  break;
-               case GL_TEXTURE_3D:            texture = context->getTexture3D();       break;
-               case GL_TEXTURE_CUBE_MAP:      texture = context->getTextureCubeMap();  break;
-               case GL_TEXTURE_EXTERNAL_OES:  texture = context->getTextureExternal(); break;
-               case GL_TEXTURE_RECTANGLE_ARB: texture = context->getTexture2DRect();   break;
-               default:
-                       return error(GL_INVALID_ENUM);
+                       return;
                }
 
                switch(pname)