Commit c94ba1d5 by Luc Ferron Committed by Commit Bot

Vulkan: Enable a bunch of texture related tests

Also adds a small bugfix in PixelBuffer::stageSubresourceUpdateFromFramebuffer where we weren't using the right format for the pack pixels params. The format should be unsized so that the fastcopyfunc / colorwritefunc / colorreadfunc are found correctly if needed when packing pixels. Bug: angleproject:2653 Bug: angleproject:2501 Change-Id: Ie4aacc623ddc9583360ab0c99be19d3db2bdbf44 Reviewed-on: https://chromium-review.googlesource.com/1104395 Commit-Queue: Luc Ferron <lucferron@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 339b95ef
...@@ -201,7 +201,7 @@ gl::Error PixelBuffer::stageSubresourceUpdateFromFramebuffer(const gl::Context * ...@@ -201,7 +201,7 @@ gl::Error PixelBuffer::stageSubresourceUpdateFromFramebuffer(const gl::Context *
PackPixelsParams params; PackPixelsParams params;
params.area = sourceArea; params.area = sourceArea;
params.format = formatInfo.internalFormat; params.format = formatInfo.format;
params.type = formatInfo.type; params.type = formatInfo.type;
params.outputPitch = static_cast<GLuint>(outputRowPitch); params.outputPitch = static_cast<GLuint>(outputRowPitch);
params.packBuffer = nullptr; params.packBuffer = nullptr;
......
...@@ -1557,10 +1557,6 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGB) ...@@ -1557,10 +1557,6 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGB)
TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA) TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA)
{ {
// TODO(lucferron): copySubImage isn't implemented yet.
// http://anglebug.com/2501
ANGLE_SKIP_TEST_IF(IsVulkan());
// Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284) // Ignore SDK layers messages on D3D11 FL 9.3 (http://anglebug.com/1284)
ANGLE_SKIP_TEST_IF(IsD3D11_FL93()); ANGLE_SKIP_TEST_IF(IsD3D11_FL93());
...@@ -1573,9 +1569,6 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA) ...@@ -1573,9 +1569,6 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA)
// handles GL_ALPHA // handles GL_ALPHA
TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE) TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
{ {
// TODO(lucferron): DIRTY_BIT_UNPACK_STATE isn't implemented on Vulkan yet.
ANGLE_SKIP_TEST_IF(IsVulkan());
const int npotTexSize = 5; const int npotTexSize = 5;
const int potTexSize = 4; // Should be less than npotTexSize const int potTexSize = 4; // Should be less than npotTexSize
GLuint tex2D; GLuint tex2D;
...@@ -1667,10 +1660,6 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE) ...@@ -1667,10 +1660,6 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
// ANGLE previously rejected this if GL_OES_texture_npot wasn't active, which is incorrect. // ANGLE previously rejected this if GL_OES_texture_npot wasn't active, which is incorrect.
TEST_P(Texture2DTest, NPOTSubImageParameters) TEST_P(Texture2DTest, NPOTSubImageParameters)
{ {
// TODO(lucferron): Generate mipmap on vulkan isn't implemented yet. Re-enable this when it
// is.
ANGLE_SKIP_TEST_IF(IsVulkan());
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment