X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=fe0ec3c74e3eb8622d634b8820da497719e65c76;hb=23ff2420fe9bb02152cdb47c90acf4262b863414;hp=b5da71f4c4949fe01456cc8fb2677e08866919f1;hpb=b7c39e0d9229a7616c63cf545cdd9576b9bf3e2c;p=flatwaifu.git

diff --git a/src/gl/render.c b/src/gl/render.c
index b5da71f..fe0ec3c 100644
--- a/src/gl/render.c
+++ b/src/gl/render.c
@@ -1,5 +1,6 @@
 #include "glob.h"
 #include "render.h"
+#include "system.h"
 #include "files.h"
 #include "memory.h"
 #include "misc.h"
@@ -26,9 +27,10 @@
 #else
 #  include <GL/gl.h>
 #endif
-#include <stdlib.h> // malloc free abs
-#include <assert.h> // assert
-#include <SDL.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
 
 #define VGA_TRANSPARENT_COLOR 0
 #define DEFAULT_SKY_COLOR 0x97
@@ -80,7 +82,6 @@ int SCRW = 320; // public
 int SCRH = 200; // public
 static int gamma;
 static int fullscreen;
-static SDL_Surface *surf;
 static rgb playpal[256];
 static byte bright[256];
 static GLuint lastTexture;
@@ -254,6 +255,14 @@ static void R_node_free (node *n) {
   }
 }
 
+static void R_cache_get_max_texture_size (int *w, int *h) {
+  GLint size = 0;
+  glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size);
+  size = min(max(size, 0), 512); // more can be buggy on older hardware
+  *w = size;
+  *h = size;
+}
+
 static void R_gl_bind_texture (GLuint id) {
   if (id != lastTexture) {
     glBindTexture(GL_TEXTURE_2D, id);
@@ -261,24 +270,23 @@ static void R_gl_bind_texture (GLuint id) {
 }
 
 static cache *R_cache_new (void) {
-  GLuint id = 0;
-  GLint size = 0;
+  int w, h;
+  GLuint id;
   cache *c = NULL;
-  glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size);
-  size = size < 512 ? size : 512; // more can be buggy on older hardware
-  if (size) {
+  R_cache_get_max_texture_size(&w, &h);
+  if (w && h) {
     glGenTextures(1, &id);
     if (id) {
       R_gl_bind_texture(id);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
       c = malloc(sizeof(cache));
       if (c != NULL) {
         *c = (cache) {
           .id = id,
-          .root.r = size - 1,
-          .root.b = size - 1
+          .root.r = w - 1,
+          .root.b = h - 1
         };
       } else {
         glDeleteTextures(1, &id);
@@ -310,25 +318,28 @@ static node *R_cache_alloc (cache *root, int w, int h) {
   node *n = NULL;
   cache *p = NULL;
   cache *c = root;
-  // TODO return null if required size greater than maximum
-  while (c && !n) {
-    n = R_node_alloc(&c->root, w, h);
-    if (n) {
-      assert(n->leaf);
-      n->base = c;
-    }
-    p = c;
-    c = c->next;
-  }
-  if (!n) {
-    c = R_cache_new();
-    if (c) {
-      p->next = c;
+  int maxw, maxh;
+  R_cache_get_max_texture_size(&maxw, &maxh);
+  if (w <= maxw && h <= maxh) {
+    while (c && !n) {
       n = R_node_alloc(&c->root, w, h);
       if (n) {
         assert(n->leaf);
         n->base = c;
       }
+      p = c;
+      c = c->next;
+    }
+    if (!n) {
+      c = R_cache_new();
+      if (c) {
+        p->next = c;
+        n = R_node_alloc(&c->root, w, h);
+        if (n) {
+          assert(n->leaf);
+          n->base = c;
+        }
+      }
     }
   }
   if (n) {
@@ -339,17 +350,17 @@ static node *R_cache_alloc (cache *root, int w, int h) {
   return n;
 }
 
-static void R_cache_update (node *n, const void *data, int w, int h) {
+static void R_cache_update (node *n, const void *data, int x, int y, int w, int h) {
   assert(n);
   assert(n->leaf);
   assert(n->base);
   assert(data);
-  int nw = n->r - n->l + 1;
-  int nh = n->b - n->t + 1;
-  assert(w == nw);
-  assert(h == nh);
+  assert(x >= 0);
+  assert(y >= 0);
+  assert(n->l + x + w - 1 <= n->r);
+  assert(n->t + y + h - 1 <= n->b);
   R_gl_bind_texture(n->base->id);
-  glTexSubImage2D(GL_TEXTURE_2D, 0, n->l, n->t, nw, nh, GL_RGBA, GL_UNSIGNED_BYTE, data);
+  glTexSubImage2D(GL_TEXTURE_2D, 0, n->l + x, n->t + y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data);
 }
 
 /* Generic helpers */
@@ -481,7 +492,7 @@ static rgba *R_extract_rgba_spr (vgaimg *v) {
 static image R_gl_create_image (const rgba *buf, int w, int h) {
   node *n = R_cache_alloc(root, w, h);
   if (n) {
-    R_cache_update(n, buf, w, h);
+    R_cache_update(n, buf, 0, 0, w, h);
   }
   return (image) {
     .n = n,
@@ -1430,7 +1441,7 @@ void R_draw (void) {
       break;
   }
   GM_draw();
-  SDL_GL_SwapBuffers();
+  Y_swap_buffers();
 }
 
 void R_alloc (void) {
@@ -1660,19 +1671,22 @@ void R_alloc (void) {
 }
 
 void R_init (void) {
-  Uint32 flags = SDL_OPENGL;
+  int res = 0;
+  int flags = SYSTEM_USE_OPENGL;
   if (fullscreen) {
-    flags = flags | SDL_FULLSCREEN;
+    flags |= SYSTEM_USE_FULLSCREEN;
   }
+  logo("R_init: intialize opengl render\n");
+  int was = Y_videomode_setted();
   if (SCRW <= 0 || SCRH <= 0) {
     ERR_failinit("Invalid screen size %ix%i\n", SCRW, SCRH);
   }
-  if (surf == NULL) {
+  if (was == 0) {
     R_init_playpal(); // only onece
   }
-  surf = SDL_SetVideoMode(SCRW, SCRH, 0, flags);
-  if (surf == NULL) {
-    ERR_failinit("Unable to set video mode: %s\n", SDL_GetError());
+  res = Y_set_videomode(SCRW, SCRH, flags);
+  if (res == 0) {
+    ERR_failinit("Unable to set video mode\n");
   }
   root = R_cache_new();
   assert(root);
@@ -1681,6 +1695,7 @@ void R_init (void) {
 
 void R_done (void) {
   R_cache_free(root, 1);
+  Y_unset_videomode();
 }
 
 void R_setgamma (int g) {
@@ -1693,9 +1708,9 @@ int R_getgamma (void) {
 
 void R_toggle_fullscreen (void) {
   fullscreen = !fullscreen;
-  if (surf) {
-    R_init(); // recreate window
-  }
+//  if (surf) {
+//    R_init(); // recreate window
+//  }
 }
 
 void R_get_name (int n, char s[8]) {