X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.cpp;h=e1106334be7fc7c209ae431f19260052e1444eee;hb=7455834be5e9ff5818a270bf1408ebd7b2d018f9;hp=204bb94b933c18b3c41501387ecc9f180bb99ad0;hpb=d8d915dba254dee5381c82788074f4374293f45a;p=nageru

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 204bb94..e110633 100644
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,5 +1,6 @@
 #include "pbo_frame_allocator.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
@@ -9,7 +10,7 @@
 using namespace std;
 
 PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
-        : frame_size(frame_size), buffer(buffer)
+        : buffer(buffer)
 {
 	userdata.reset(new Userdata[num_queued_frames]);
 	for (size_t i = 0; i < num_queued_frames; ++i) {
@@ -31,32 +32,44 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
 		frame.owner = this;
 		frame.interleaved = true;
 
-		// Create textures.
-		glGenTextures(1, &userdata[i].tex_y);
-		check_error();
-		glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-		check_error();
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
-		check_error();
+		// Create textures. We don't allocate any data for the second field at this point
+		// (just create the texture state with the samplers), since our default assumed
+		// resolution is progressive.
+		glGenTextures(2, userdata[i].tex_y);
+		check_error();
+		glGenTextures(2, userdata[i].tex_cbcr);
+		check_error();
+		userdata[i].last_width[0] = width;
+		userdata[i].last_height[0] = height;
+		userdata[i].last_width[1] = 0;
+		userdata[i].last_height[1] = 0;
+		for (unsigned field = 0; field < 2; ++field) {
+			glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			check_error();
+			if (field == 0) {
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+				check_error();
+			}
 
-		glGenTextures(1, &userdata[i].tex_cbcr);
-		check_error();
-		glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		check_error();
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-		check_error();
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
-		check_error();
+			glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr[field]);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			check_error();
+			if (field == 0) {
+				glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
+				check_error();
+			}
+		}
 
 		freelist.push(frame);
 	}
@@ -80,11 +93,9 @@ PBOFrameAllocator::~PBOFrameAllocator()
 		check_error();
 		glDeleteBuffers(1, &pbo);
 		check_error();
-		GLuint tex_y = ((Userdata *)frame.userdata)->tex_y;
-		glDeleteTextures(1, &tex_y);
+		glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y);
 		check_error();
-		GLuint tex_cbcr = ((Userdata *)frame.userdata)->tex_cbcr;
-		glDeleteTextures(1, &tex_cbcr);
+		glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cbcr);
 		check_error();
 	}
 }