From 6d7f3298801313db33d7a1d44384207e9eb98b58 Mon Sep 17 00:00:00 2001 From: Erik Abair Date: Tue, 26 Apr 2022 21:18:52 -0700 Subject: [PATCH] nv2a: Fix glsl ambiguous overload to prevent renderdoc failure --- hw/xbox/nv2a/debug.c | 9 +++++++-- hw/xbox/nv2a/psh.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/xbox/nv2a/debug.c b/hw/xbox/nv2a/debug.c index 4f49173e49..c17affcaf6 100644 --- a/hw/xbox/nv2a/debug.c +++ b/hw/xbox/nv2a/debug.c @@ -169,14 +169,19 @@ void gl_debug_frame_terminator(void) if (rdoc_api->IsTargetControlConnected()) { if (rdoc_api->IsFrameCapturing()) { rdoc_api->EndFrameCapture(NULL, NULL); - CHECK_GL_ERROR(); + GLenum error = glGetError(); + if (error != GL_NO_ERROR) { + fprintf(stderr, + "Renderdoc EndFrameCapture triggered GL error 0x%X - ignoring\n", + error); + } } if (renderdoc_capture_frames) { rdoc_api->StartFrameCapture(NULL, NULL); GLenum error = glGetError(); if (error != GL_NO_ERROR) { fprintf(stderr, - "Renderdoc frame capture triggered GL error 0x%X - ignoring\n", + "Renderdoc StartFrameCapture triggered GL error 0x%X - ignoring\n", error); } --renderdoc_capture_frames; diff --git a/hw/xbox/nv2a/psh.c b/hw/xbox/nv2a/psh.c index 91cac57543..bb70ee1cb9 100644 --- a/hw/xbox/nv2a/psh.c +++ b/hw/xbox/nv2a/psh.c @@ -653,8 +653,8 @@ static MString* psh_convert(struct PixelShader *ps) mstring_append(clip, "bool clipContained = false;\n"); } mstring_append(clip, "for (int i = 0; i < 8; i++) {\n" - " bvec4 clipTest = bvec4(lessThan(gl_FragCoord.xy-0.5, clipRegion[i].xy),\n" - " greaterThan(gl_FragCoord.xy-0.5, clipRegion[i].zw));\n" + " bvec4 clipTest = bvec4(lessThan(gl_FragCoord.xy-0.5, vec2(clipRegion[i].xy)),\n" + " greaterThan(gl_FragCoord.xy-0.5, vec2(clipRegion[i].zw)));\n" " if (!any(clipTest)) {\n"); if (ps->state.window_clip_exclusive) { mstring_append(clip, " discard;\n");