From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 28 Mar 2020 23:47:38 +0000 (+0100)
Subject: Fix an issue with 10-bit input and nonstandard heights (e.g. 1920x800).
X-Git-Tag: 1.9.2~6
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=56b842e00ad8d4e20176df6f4434d2b0885bced0

Fix an issue with 10-bit input and nonstandard heights (e.g. 1920x800).
---

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 63d1f72..465e967 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -110,11 +110,17 @@ void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned f
 		assert(false);
 	}
 
-	if (first ||
-	    width != userdata->last_width[field] ||
-	    height != userdata->last_height[field] ||
-	    cbcr_width != userdata->last_cbcr_width[field] ||
-	    cbcr_height != userdata->last_cbcr_height[field]) {
+	const bool recreate_main_texture =
+		first ||
+		width != userdata->last_width[field] ||
+		height != userdata->last_height[field] ||
+		cbcr_width != userdata->last_cbcr_width[field] ||
+		cbcr_height != userdata->last_cbcr_height[field];
+	const bool recreate_v210_texture =
+		global_flags.ten_bit_input &&
+		(first || v210_width != userdata->last_v210_width[field] || height != userdata->last_height[field]);
+
+	if (recreate_main_texture) {
 		// We changed resolution since last use of this texture, so we need to create
 		// a new object. Note that this each card has its own PBOFrameAllocator,
 		// we don't need to worry about these flip-flopping between resolutions.
@@ -166,14 +172,14 @@ void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned f
 		userdata->last_cbcr_width[field] = cbcr_width;
 		userdata->last_cbcr_height[field] = cbcr_height;
 	}
-	if (global_flags.ten_bit_input &&
-	    (first || v210_width != userdata->last_v210_width[field])) {
+	if (recreate_v210_texture) {
 		// Same as above; we need to recreate the texture.
 		glBindTexture(GL_TEXTURE_2D, userdata->tex_v210[field]);
 		check_error();
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 		check_error();
 		userdata->last_v210_width[field] = v210_width;
+		userdata->last_height[field] = height;
 	}
 }