diff options
| author | linlin.xu <linlin.xu@arm.com> | 2024-03-05 20:22:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-05 20:22:24 +0000 |
| commit | 09e03308cbf66efed22556993483b807ea88d182 (patch) | |
| tree | 7113d8fe63ceabf9996c094bd577d17aee58208d | |
| parent | 3e82783fbc2a81af4a9eeb25b5425de72843b1b5 (diff) | |
| parent | 8e177fd0b852bc67fb0255b1617b1b5cac5fffaa (diff) | |
| download | deqp-09e03308cbf66efed22556993483b807ea88d182.tar.gz | |
Tweak grid size in vertex shader render test. am: 39e80e27c8 am: 8e177fd0b8temp_319669529
Original change: https://android-review.googlesource.com/c/platform/external/deqp/+/2979511
Change-Id: I6a28fd139f3390afae2d86347b1b2a08e3c5cdf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | modules/gles3/functional/es3fShaderMatrixTests.cpp | 3 | ||||
| -rw-r--r-- | modules/glshared/glsShaderRenderCase.cpp | 4 | ||||
| -rw-r--r-- | modules/glshared/glsShaderRenderCase.hpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/modules/gles3/functional/es3fShaderMatrixTests.cpp b/modules/gles3/functional/es3fShaderMatrixTests.cpp index 6d98bc65b..edb981891 100644 --- a/modules/gles3/functional/es3fShaderMatrixTests.cpp +++ b/modules/gles3/functional/es3fShaderMatrixTests.cpp @@ -1712,6 +1712,9 @@ void ShaderMatrixCase::init (void) } ShaderRenderCase::init(); + + // reassign grid size prevent matrix inverse inf value. + m_gridSize = 64; } std::string ShaderMatrixCase::genGLSLMatToVec3Reduction (const glu::DataType& matType, const char* varName) diff --git a/modules/glshared/glsShaderRenderCase.cpp b/modules/glshared/glsShaderRenderCase.cpp index b8699174d..6fe3b4d95 100644 --- a/modules/glshared/glsShaderRenderCase.cpp +++ b/modules/glshared/glsShaderRenderCase.cpp @@ -403,6 +403,8 @@ void ShaderRenderCase::init (void) ShaderRenderCase::deinit(); throw; } + + m_gridSize = GRID_SIZE; } void ShaderRenderCase::deinit (void) @@ -433,7 +435,7 @@ TestNode::IterateResult ShaderRenderCase::iterate (void) int height = viewportSize.y(); // \todo [petri] Better handling of constCoords (render in multiple chunks, vary coords). - QuadGrid quadGrid(m_isVertexCase ? GRID_SIZE : 4, width, height, Vec4(0.125f, 0.25f, 0.5f, 1.0f), m_userAttribTransforms, m_textures); + QuadGrid quadGrid(m_isVertexCase ? m_gridSize : 4, width, height, Vec4(0.125f, 0.25f, 0.5f, 1.0f), m_userAttribTransforms, m_textures); // Render result. Surface resImage(width, height); diff --git a/modules/glshared/glsShaderRenderCase.hpp b/modules/glshared/glsShaderRenderCase.hpp index e8299c856..e07e85d85 100644 --- a/modules/glshared/glsShaderRenderCase.hpp +++ b/modules/glshared/glsShaderRenderCase.hpp @@ -252,6 +252,7 @@ protected: std::vector<TextureBinding> m_textures; glu::ShaderProgram* m_program; + int m_gridSize; }; // Helpers. |