Audio and video experiments. Closes #45

Author: Chips-fr

Makefile

@@ -233,6 +233,7 @@ endif
 
 ifeq ($(HAVE_GLES_DISPLAY), 1)
 OBJS += src/od-gles/gl.o
+OBJS += src/od-gles/shader_stuff.o
 OBJS += src/od-gles/gl_platform.o
 OBJS += src/od-gles/gles_gfx.o
 MORE_CFLAGS += -I/opt/vc/include/

fshader.glsl

@@ -0,0 +1,44 @@
+// CRT emulation filter fragment shader
+precision mediump float;
+varying vec2 v_texCoord;
+uniform sampler2D s_texture;
+uniform float u_framecount;
+uniform vec2 u_emulator_frame_size;
+uniform vec2 u_output_frame_size;
+
+//#define TEXSTEP_H (0.50/800.0)
+//#define TEXSTEP_V (0.25/480.0)
+//#define TEXSTEP_H (0.50/1200.0)
+//#define TEXSTEP_V (0.25/720.0)
+
+void main()
+{
+	float tsh = 0.5 / 1200.0;
+	float tsv = 0.5 / 720.0;
+	vec2 tc = v_texCoord + vec2(tsh, tsv + sin(u_framecount) * 0.0);
+	// gl_FragColor = texture2D( s_texture, v_texCoord );
+	vec4 pix5 = texture2D( s_texture, tc ) * 0.8; // main, center pixel
+
+	vec4 pix2 = texture2D( s_texture, tc + vec2(0.0, -tsv) );
+	vec4 pix4 = texture2D( s_texture, tc + vec2(-tsh, 0.0) );
+	vec4 pix6 = texture2D( s_texture, tc + vec2(+tsh, 0.0) );
+	vec4 pix8 = texture2D( s_texture, tc + vec2(0.0, +tsv) );
+
+	gl_FragColor = 
+		pix5
+		//* clamp(cos(gl_FragCoord.y * 3.1415926) * 0.5 + 0.5, 0.0, 1.0)
+		* clamp(cos(v_texCoord.y * 3.1415926 * 720.0) * 0.25 + 0.92, 0.0, 1.0)
+		
+		// * vec4((sin(u_framecount) * 0.005 + 0.98))
+		+ (
+			  pow(pix2 * .7, vec4(1.5))
+			 + pow(pix4 * .7, vec4(1.5))
+			 + pow(pix6 * .7, vec4(1.5))
+			 + pow(pix8 * .7, vec4(1.5))
+
+		  ) * 0.3
+		; 
+//	gl_FragColor = texture2D( s_texture, v_texCoord );
+
+}
+

src/od-gles/gl.cpp

@@ -1,11 +1,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <math.h>
+
 #include <EGL/egl.h>
 #include <GLES/gl.h>
+
 #include "gl_platform.h"
 #include "gl.h"
 
+#include "shader_stuff.h"
+
+
 static EGLDisplay edpy;
 static EGLSurface esfc;
 static EGLContext ectxt;
@@ -14,6 +20,29 @@ static EGLContext ectxt;
 void *gl_es_display;
 void *gl_es_surface;
 
+
+static float vertex_coords[] = {
+	-1.0f,  1.0f,  0.0f, // 0    0  1
+	 1.0f,  1.0f,  0.0f, // 1  ^
+	-1.0f, -1.0f,  0.0f, // 2  | 2  3
+	 1.0f, -1.0f,  0.0f, // 3  +-->
+};
+
+static float orig_texture_coords[] = {
+	-0.5f, -0.5f, 
+	0.5f, -0.5f, 
+	-0.5f, 0.5f, 
+	0.5f, 0.5f, 
+};
+
+static float texture_coords[] = {
+	0.0f, 0.0f, // we flip this:
+	1.0f, 0.0f, // v^
+	0.0f, 1.0f, //  |  u
+	1.0f, 1.0f, //  +-->
+};
+
+
 static int gl_have_error(const char *name)
 {
 	GLenum e = glGetError();
@@ -42,11 +71,25 @@ int gl_init(void *display, void *window, int *quirks)
 	EGLint num_config;
 	int retval = -1;
 	int ret;
-	EGLint attr[] =
-	{
-		EGL_NONE
-	};
-
+	
+   static const EGLint config_attributes[] =
+   {
+      EGL_RED_SIZE, 8,
+      EGL_GREEN_SIZE, 8,
+      EGL_BLUE_SIZE, 8,
+      EGL_ALPHA_SIZE, 8,
+      EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+      EGL_NONE
+   };
+   
+   static const EGLint context_attributes[] = 
+   {
+      EGL_CONTEXT_CLIENT_VERSION, 2,
+      EGL_NONE
+   };
+	
+
+	// gl_platform_init() does Raspi-specific stuff like bcm_host_init()
 	ret = gl_platform_init(&display, &window, quirks);
 	if (ret != 0) {
 		printf("gl_platform_init failed with %d\n", ret);
@@ -70,7 +113,7 @@ int gl_init(void *display, void *window, int *quirks)
 		goto out;
 	}
 
-	if (!eglChooseConfig(edpy, attr, &ecfg, 1, &num_config)) {
+	if (!eglChooseConfig(edpy, config_attributes, &ecfg, 1, &num_config)) {
 		printf("Failed to choose config (%x)\n", eglGetError());
 		goto out;
 	}
@@ -88,7 +131,8 @@ int gl_init(void *display, void *window, int *quirks)
 		goto out;
 	}
 
-	ectxt = eglCreateContext(edpy, ecfg, EGL_NO_CONTEXT, NULL);
+//	ectxt = eglCreateContext(edpy, ecfg, EGL_NO_CONTEXT, NULL);
+	ectxt = eglCreateContext(edpy, ecfg, EGL_NO_CONTEXT, context_attributes);
 	if (ectxt == EGL_NO_CONTEXT) {
 		printf("Unable to create EGL context (%x)\n",
 			eglGetError());
@@ -97,16 +141,20 @@ int gl_init(void *display, void *window, int *quirks)
 
 	eglMakeCurrent(edpy, esfc, esfc, ectxt);
 
-	glEnable(GL_TEXTURE_2D);
+	//glEnable(GL_TEXTURE_2D); // for old fixed-function pipeline
+	//if (gl_have_error("glEnable(GL_TEXTURE_2D)")) goto out;
 
 	glGenTextures(1, &texture_name);
+	if (gl_have_error("glGenTextures")) goto out;
+
+
 
 	glBindTexture(GL_TEXTURE_2D, texture_name);
+	if (gl_have_error("glBindTexture")) goto out;
 
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1024, 512, 0, GL_RGB,
 		GL_UNSIGNED_SHORT_5_6_5, tmp_texture_mem);
-	if (gl_have_error("glTexImage2D"))
-		goto out;
+	if (gl_have_error("glTexImage2D")) goto out;
 
 	// no mipmaps
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -126,57 +174,93 @@ int gl_init(void *display, void *window, int *quirks)
 	gl_es_display = (void *)edpy;
 	gl_es_surface = (void *)esfc;
 	retval = 0;
+
+	int shader_stuff_result;
+	shader_stuff_result = shader_stuff_init();
+	shader_stuff_result = shader_stuff_reload_shaders();
+	shader_stuff_result = shader_stuff_set_data(vertex_coords, texture_coords, texture_name);
+
 out:
 	free(tmp_texture_mem);
 	return retval;
 }
 
-static float vertices[] = {
-	-1.0f,  1.0f,  0.0f, // 0    0  1
-	 1.0f,  1.0f,  0.0f, // 1  ^
-	-1.0f, -1.0f,  0.0f, // 2  | 2  3
-	 1.0f, -1.0f,  0.0f, // 3  +-->
-};
-
-static float texture[] = {
-	0.0f, 0.0f, // we flip this:
-	1.0f, 0.0f, // v^
-	0.0f, 1.0f, //  |  u
-	1.0f, 1.0f, //  +-->
-};
+static int framecount = 0;
 
 int gl_flip(const void *fb, int w, int h)
 {
 	static int old_w, old_h;
 
+	if (framecount % 60 == 0)
+	{
+//		printf("gl_flip() w: %d, h: %d\n", w, h);
+	}
+	
+	if (framecount % 30 == 0)
+	{
+		if (shader_stuff_shader_needs_reload()) {
+			 shader_stuff_reload_shaders();
+			 // shader_stuff_set_data(vertex_coords, texture_coords, texture_name);
+			
+		 }
+	}
+
+	framecount++;
+	float floattime = (framecount * 0.04f);
+
 	if (fb != NULL) {
 		if (w != old_w || h != old_h) {
 			float f_w = (float)w / 1024.0f;
 			float f_h = (float)h / 512.0f;
-			texture[1*2 + 0] = f_w;
-			texture[2*2 + 1] = f_h;
-			texture[3*2 + 0] = f_w;
-			texture[3*2 + 1] = f_h;
+			texture_coords[1*2 + 0] = f_w;
+			texture_coords[2*2 + 1] = f_h;
+			texture_coords[3*2 + 0] = f_w;
+			texture_coords[3*2 + 1] = f_h;
 			old_w = w;
 			old_h = h;
+		} 
+/*
+		float rotmat[4]; // 2d rotation matrix
+		rotmat[0] = cos(floattime);
+		rotmat[1] = sin(floattime);
+		rotmat[2] = -sin(floattime);
+		rotmat[3] = cos(floattime);
+
+		for (int i=0; i<4; i++) {
+				float f_w = (float)w / 1024.0f;
+				float f_h = (float)h / 512.0f;
+				float x = orig_texture_coords[i*2 + 0] * f_w;
+				float y = orig_texture_coords[i*2 + 1] * f_h;
+				texture_coords[i*2 + 0] = 
+					f_w * 0.5f + (x * rotmat[0] + y * rotmat[1]);
+				texture_coords[i*2 + 1] = 
+					f_h * 0.5f + (x * rotmat[2] + y * rotmat[3]);
+
 		}
+*/
 
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h,
 			GL_RGB, GL_UNSIGNED_SHORT_5_6_5, fb);
 		if (gl_have_error("glTexSubImage2D"))
 			return -1;
-	}
+	} // if (fb != NULL)
+
+	// glVertexPointer(3, GL_FLOAT, 0, vertex_coords);
+	// if (gl_have_error("glVertexPointer")) return -1;
+
+	// glTexCoordPointer(2, GL_FLOAT, 0, texture_coords);
+	// if (gl_have_error("glTexCoordPointer")) return -1;
+
+	shader_stuff_frame(framecount, w, h, 800, 480); // TODO! hard-coded output size
+	if (gl_have_error("use program")) return -1;
 
-	glVertexPointer(3, GL_FLOAT, 0, vertices);
-	glTexCoordPointer(2, GL_FLOAT, 0, texture);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+//	glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
-	if (gl_have_error("glDrawArrays"))
-		return -1;
+	if (gl_have_error("glDrawArrays")) return -1;
 
 	eglSwapBuffers(edpy, esfc);
-	if (gles_have_error("eglSwapBuffers"))
-		return -1;
+	if (gles_have_error("eglSwapBuffers")) return -1;
 
 	return 0;
 }

src/od-gles/gles_gfx.cpp

@@ -137,6 +137,13 @@ static void open_screen(struct uae_prefs *p)
   }
 
 
+  if(Dummy_prSDLScreen)
+  { // y.f. 2016-10-13 : free the previous screen surface every time, 
+    // so we can have fullscreen while running and windowed while in config window.
+   // Apparently, something somewhere is resetting the screen.
+	SDL_FreeSurface(Dummy_prSDLScreen);
+	Dummy_prSDLScreen = NULL;
+  }
 
   if(Dummy_prSDLScreen == NULL )
   {