Convert HQx and scrap to 32-bit color.

Allow putting small 32-bit pics onto the scrap and upscaling them. Also limit upscaling level based on maximum GL rexture size.
savvykms · Apr 14, 2013 · c0aae81 · c0aae81
1 parent 8fef47a
commit c0aae81
Show file tree

Hide file tree

Showing 4 changed files with 246 additions and 215 deletions.
diff --git a/inc/shared/platform.h b/inc/shared/platform.h
@@ -94,6 +94,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define q_printf(f, a)      __attribute__((format(printf, f, a)))
 #define q_noreturn          __attribute__((noreturn))
+#define q_noinline          __attribute__((noinline))
 #define q_malloc            __attribute__((malloc))
 #if __GNUC__ >= 4
 #define q_sentinel          __attribute__((sentinel))
@@ -127,6 +128,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define q_printf(f, a)
 #define q_noreturn
+#define q_noinline
 #define q_malloc
 #define q_sentinel
 

diff --git a/src/refresh/gl/gl.h b/src/refresh/gl/gl.h
@@ -488,6 +488,6 @@ void GL_DrawAliasModel(model_t *model);
  * hq2x.c
  *
  */
-void HQ2x_Render(uint32_t *output, const uint8_t *input, int width, int height);
-void HQ4x_Render(uint32_t *output, const uint8_t *input, int width, int height);
+void HQ2x_Render(uint32_t *output, const uint32_t *input, int width, int height);
+void HQ4x_Render(uint32_t *output, const uint32_t *input, int width, int height);
 void HQ2x_Init(void);