Capture/Replay: Use glUniform1iv on samplers, ignore images

In OpenGL, GL_INT is expected for sampler uniforms. Before this our emitted code was using the underlying return type, which can be unsigned, leading to glUniformuiv. Also, don't try to set image uniforms with glUniform calls, it is not allowed. Test: Fortnite MEC Bug: b/170755560 Change-Id: I6786df487285fee77cfe792dfa85eb17feb155e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2611557 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>

Capture/Replay: Use glUniform1iv on samplers, ignore images
2e3786ed · Cody Northrop · Commit Bot · e670fc72 · 2e3786ed
Commit 2e3786ed authored Dec 18, 2020 by Cody Northrop Committed by Commit Bot Jan 19, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 0 deletions

FrameCapture.cpp src/libANGLE/FrameCapture.cpp +20 -0

No files found.
--- a/src/libANGLE/FrameCapture.cpp
+++ b/src/libANGLE/FrameCapture.cpp
@@ -1826,6 +1826,26 @@ void CaptureUpdateUniformValues(const gl::State &replayState,
        if (readLoc.value == -1)
            continue;

+        // Image uniforms are special and cannot be set this way
+        if (typeInfo->isImageType)
+            continue;
+
+        // Samplers should be populated with GL_INT, regardless of return type
+        if (typeInfo->isSampler)
+        {
+            std::vector<GLint> uniformBuffer(uniformSize);
+            for (int index = 0; index < uniformCount; index++, readLoc.value++)
+            {
+                program->getUniformiv(context, readLoc,
+                                      uniformBuffer.data() + index * componentCount);
+            }
+
+            Capture(callsOut, CaptureUniform1iv(replayState, true, uniformLoc, uniformCount,
+                                                uniformBuffer.data()));
+
+            continue;
+        }
+
        switch (typeInfo->componentType)
        {
            case GL_FLOAT: