Merge branch 'clean' into main

Author: dqh-au

vice/data/GLSL/viewport.vert

@@ -3,12 +3,14 @@
 uniform vec4 scale;
 uniform vec2 view_size;
 
+uniform mat4 rotation;
+
 in vec4 position;
 in vec2 tex;
 
 out vec2 tex_coord;
 
 void main() {
-    gl_Position = position * scale;
+    gl_Position = position * scale * rotation;
     tex_coord = (tex * (view_size - 1.0) + 0.5) / view_size;
-}
+}

vice/src/arch/gtk3/opengl_renderer.c

@@ -84,7 +84,7 @@ static GLuint create_shader_program(char *vertex_shader_filename, char *fragment
  * entire display area, and the last eight assign texture coordinates
  * to each corner.
  */
-static float vertexData[] = {
+static float vertexData[16 + 8] = {
         -1.0f, -1.0f, 0.0f, 1.0f,
          1.0f, -1.0f, 0.0f, 1.0f,
         -1.0f,  1.0f, 0.0f, 1.0f,
@@ -103,6 +103,21 @@ static const float vertexDataPatches[4][8] = {
     { 1.0f, 0.0f,  0.0f, 0.0f,  1.0f, 1.0f,  0.0f, 1.0f },  /* flip x & y */
 };
 
+static const float model_matrix[2][16] = {
+    { /* ident, no rotation */
+      1.0f,   0.0f, 0.0f, 0.0f,
+      0.0f,   1.0f, 0.0f, 0.0f,
+      0.0f,   0.0f, 1.0f, 0.0f,
+      0.0f,   0.0f, 0.0f, 1.0f
+    }, {
+      /* rotated 90 degr clockwise */
+      0.0f,   1.0f, 0.0f, 0.0f,
+     -1.0f,   0.0f, 0.0f, 0.0f,
+      0.0f,   0.0f, 1.0f, 0.0f,
+      0.0f,   0.0f, 0.0f, 1.0f
+    }
+};
+
 /**/
 
 static void vice_opengl_initialise_canvas(video_canvas_t *canvas)
@@ -528,8 +543,6 @@ static void legacy_render(video_canvas_t *canvas, float scale_x, float scale_y)
     vice_opengl_renderer_context_t *context = (vice_opengl_renderer_context_t *)canvas->renderer_context;
     filter = canvas->videoconfig->glfilter;
 
-    /* FIXME: add support for rotate */
-
     /* update texture coords according to flipx/flipy */
     flipidx = canvas->videoconfig->flipx | (canvas->videoconfig->flipy << 1);
     u1 = vertexDataPatches[flipidx][4];
@@ -545,6 +558,13 @@ static void legacy_render(video_canvas_t *canvas, float scale_x, float scale_y)
     glEnable(GL_TEXTURE_2D);
     glActiveTexture(GL_TEXTURE0);
 
+    /* Save the current matrix. */
+    glPushMatrix();
+
+    if (canvas->videoconfig->rotate) {
+        glRotatef(270.0f, 0, 0, 1); /* rotate 90degr clockwise */
+    }
+
     if (context->interlaced) {
         glBindTexture(GL_TEXTURE_2D, context->previous_frame_texture);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter);
@@ -584,6 +604,9 @@ static void legacy_render(video_canvas_t *canvas, float scale_x, float scale_y)
 
     glBindTexture(GL_TEXTURE_2D, 0);
     glDisable(GL_TEXTURE_2D);
+
+    /* Reset the current matrix to the one that was saved. */
+    glPopMatrix();
 }
 
 static void modern_render(video_canvas_t *canvas, float scale_x, float scale_y)
@@ -602,13 +625,12 @@ static void modern_render(video_canvas_t *canvas, float scale_x, float scale_y)
     GLuint view_size_uniform;
     GLuint source_size_uniform;
     GLuint this_frame_uniform;
+    GLuint rotation_uniform;
     GLuint last_frame_uniform = 0;
 
     vice_opengl_renderer_context_t *context = (vice_opengl_renderer_context_t *)canvas->renderer_context;
     filter = canvas->videoconfig->glfilter;
 
-    /* FIXME: add support for rotate */
-
     /* update texture coords according to flipx/flipy */
     flipidx = canvas->videoconfig->flipx | (canvas->videoconfig->flipy << 1);
     if (flipidxlast != flipidx) {
@@ -641,6 +663,7 @@ static void modern_render(video_canvas_t *canvas, float scale_x, float scale_y)
     view_size_uniform   = glGetUniformLocation(program, "view_size");
     source_size_uniform = glGetUniformLocation(program, "source_size");
     this_frame_uniform  = glGetUniformLocation(program, "this_frame");
+    rotation_uniform    = glGetUniformLocation(program, "rotation");
 
     if (context->interlaced) {
         last_frame_uniform  = glGetUniformLocation(program, "last_frame");
@@ -665,6 +688,8 @@ static void modern_render(video_canvas_t *canvas, float scale_x, float scale_y)
     glUniform2f(view_size_uniform, context->native_view_width, context->native_view_height);
     glUniform2f(source_size_uniform, context->current_frame_width, context->current_frame_height);
 
+    glUniformMatrix4fv(rotation_uniform, 1, GL_FALSE, model_matrix[canvas->videoconfig->rotate]);
+
     if (context->interlaced) {
         glUniform1i(last_frame_uniform, 0);
         glUniform1i(this_frame_uniform, 1);
@@ -760,7 +785,12 @@ static void render(void *job_data, void *pool_data)
         float viewport_aspect;
         float emulated_aspect;
 
-        viewport_aspect = (float)context->native_view_width / (float)context->native_view_height;
+        if (canvas->videoconfig->rotate) {
+            /* rotate aspect 90 degr too */
+            viewport_aspect = (float)context->native_view_height / (float)context->native_view_width;
+        } else {
+            viewport_aspect = (float)context->native_view_width / (float)context->native_view_height;
+        }
         emulated_aspect = (float)context->current_frame_width / (float)context->current_frame_height;
 
         if (canvas->videoconfig->aspect_mode == VIDEO_ASPECT_MODE_TRUE) {

vice/src/arch/gtk3/widgets/canvasrendermirrorwidget.c

@@ -81,8 +81,9 @@ GtkWidget *canvas_render_mirror_widget_create(const char *chip)
                                                          "Rotate 90\u00b0",
                                                          chip);
     /* grey out rotate option, remove this once it's implemented in the renderer */
+#ifdef WINDOWS_COMPILE
     gtk_widget_set_sensitive(rotate, 0);
-
+#endif
     gtk_grid_attach(GTK_GRID(grid), label,  0, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(grid), flip_x, 0, 1, 1, 1);
     gtk_grid_attach(GTK_GRID(grid), flip_y, 0, 2, 1, 1);