Validate cube completeness for mipmap generation.

The OpenGL ES 3.0.5 spec section 3.8.10.5 states: "For cube map textures an INVALID_OPERATION error is generated if the texture bound to target is not cube complete". Change-Id: I4304ecf125528b9406a011a95d7822b1f868ee14 Reviewed-on: https://swiftshader-review.googlesource.com/15328Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Validate cube completeness for mipmap generation.
5fc1e751 · Nicolas Capens · Nicolas Capens · 0e92ccaa · 5fc1e751 · 5fc1e751
Commit 5fc1e751 authored Dec 19, 2017 by Nicolas Capens Committed by Nicolas Capens Dec 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

Texture.h src/OpenGL/libGLESv2/Texture.h +2 -1

libGLESv2.cpp src/OpenGL/libGLESv2/libGLESv2.cpp +9 -1

No files found.
--- a/src/OpenGL/libGLESv2/Texture.h
+++ b/src/OpenGL/libGLESv2/Texture.h
@@ -242,11 +242,12 @@ public:
 	egl::Image *getImage(int face, unsigned int level);
+	bool isCubeComplete() const;
 protected:
 	~TextureCubeMap() override;
 private:
-	bool isCubeComplete() const;
 	bool isMipmapCubeComplete() const;
 	// face is one of the GL_TEXTURE_CUBE_MAP_* enumerants. Returns nullptr on failure.

--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -2261,7 +2261,15 @@ void GenerateMipmap(GLenum target)
 			texture = context->getTexture2D();
 			break;
 		case GL_TEXTURE_CUBE_MAP:
-			texture = context->getTextureCubeMap();
+			{
+				TextureCubeMap *cube = context->getTextureCubeMap();
+				texture = cube;
+				if(!cube->isCubeComplete())
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+			}
 			break;
 		case GL_TEXTURE_2D_ARRAY:
 			if(clientVersion < 3)