use dynamic eye position-centered bouncegrid when rendering in dynamic

[xonotic/darkplaces.git] / jpeg.c

diff --git a/jpeg.c b/jpeg.c
index bdcfdc40d5059a86a82b13c50143f11442055a2a..8df1b484083a2c9bf0951ee91ec12492ea5aa240 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -25,8 +25,10 @@
 #include "quakedef.h"
 #include "image.h"
 #include "jpeg.h"
+#include "image_png.h"
 
 cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
+cvar_t r_texture_jpeg_fastpicmip = {CVAR_SAVE, "r_texture_jpeg_fastpicmip", "1", "perform gl_picmip during decompression for JPEG files (faster)"};
 
 // jboolean is unsigned char instead of int on Win32
 #ifdef WIN32
@@ -52,6 +54,7 @@ typedef int jboolean;
 #define qjpeg_start_decompress jpeg_start_decompress
 #define qjpeg_std_error jpeg_std_error
 #define qjpeg_write_scanlines jpeg_write_scanlines
+#define qjpeg_simple_progression jpeg_simple_progression
 #define jpeg_dll true
 #else
 /*
@@ -99,25 +102,23 @@ typedef unsigned int JDIMENSION;
 #define C_MAX_BLOCKS_IN_MCU 10
 #define D_MAX_BLOCKS_IN_MCU 10
 
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"
 struct jpeg_memory_mgr
 {
   void* (*alloc_small) (j_common_ptr cinfo, int pool_id, size_t sizeofobject);
-  void (*alloc_large) ();
-  void (*alloc_sarray) ();
-  void (*alloc_barray) ();
-  void (*request_virt_sarray) ();
-  void (*request_virt_barray) ();
-  void (*realize_virt_arrays) ();
-  void (*access_virt_sarray) ();
-  void (*access_virt_barray) ();
-  void (*free_pool) ();
-  void (*self_destruct) ();
+  void (*_reserve_space_for_alloc_large) (void *dummy, ...);
+  void (*_reserve_space_for_alloc_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_alloc_barray) (void *dummy, ...);
+  void (*_reserve_space_for_request_virt_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_request_virt_barray) (void *dummy, ...);
+  void (*_reserve_space_for_realize_virt_arrays) (void *dummy, ...);
+  void (*_reserve_space_for_access_virt_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_access_virt_barray) (void *dummy, ...);
+  void (*_reserve_space_for_free_pool) (void *dummy, ...);
+  void (*_reserve_space_for_self_destruct) (void *dummy, ...);
 
   long max_memory_to_use;
   long max_alloc_chunk;
 };
-#pragma GCC diagnostic warning "-Wstrict-prototypes"
 
 struct jpeg_error_mgr
 {
@@ -428,6 +429,7 @@ static jboolean (*qjpeg_start_compress) (j_compress_ptr cinfo, jboolean write_al
 static jboolean (*qjpeg_start_decompress) (j_decompress_ptr cinfo);
 static struct jpeg_error_mgr* (*qjpeg_std_error) (struct jpeg_error_mgr *err);
 static JDIMENSION (*qjpeg_write_scanlines) (j_compress_ptr cinfo, unsigned char** scanlines, JDIMENSION num_lines);
+static void (*qjpeg_simple_progression) (j_compress_ptr cinfo);
 
 static dllfunction_t jpegfuncs[] =
 {
@@ -446,6 +448,7 @@ static dllfunction_t jpegfuncs[] =
        {"jpeg_start_decompress",       (void **) &qjpeg_start_decompress},
        {"jpeg_std_error",                      (void **) &qjpeg_std_error},
        {"jpeg_write_scanlines",        (void **) &qjpeg_write_scanlines},
+       {"jpeg_simple_progression",     (void **) &qjpeg_simple_progression},
        {NULL, NULL}
 };
 
@@ -492,9 +495,7 @@ qboolean JPEG_OpenLibrary (void)
 #else
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libjpeg.dll",
 #elif defined(MACOSX)
                "libjpeg.62.dylib",
@@ -595,17 +596,21 @@ JPEG_LoadImage
 Load a JPEG image into a BGRA buffer
 ====================
 */
-unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize)
+unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
        struct jpeg_decompress_struct cinfo;
        struct jpeg_error_mgr jerr;
        unsigned char *image_buffer = NULL, *scanline = NULL;
        unsigned int line;
+       int submip = 0;
 
        // No DLL = no JPEGs
        if (!jpeg_dll)
                return NULL;
 
+       if(miplevel && r_texture_jpeg_fastpicmip.integer)
+               submip = bound(0, *miplevel, 3);
+
        cinfo.err = qjpeg_std_error (&jerr);
        qjpeg_create_decompress (&cinfo);
        if(setjmp(error_in_jpeg))
@@ -614,12 +619,14 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize)
        cinfo.err->error_exit = JPEG_ErrorExit;
        JPEG_MemSrc (&cinfo, f, filesize);
        qjpeg_read_header (&cinfo, TRUE);
+       cinfo.scale_num = 1;
+       cinfo.scale_denom = (1 << submip);
        qjpeg_start_decompress (&cinfo);
 
-       image_width = cinfo.image_width;
-       image_height = cinfo.image_height;
+       image_width = cinfo.output_width;
+       image_height = cinfo.output_height;
 
-       if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+       if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
        {
                Con_Printf("JPEG_LoadImage: invalid image size %ix%i\n", image_width, image_height);
                return NULL;
@@ -679,11 +686,14 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize)
 
                line++;
        }
-       Mem_Free (scanline);
+       Mem_Free (scanline); scanline = NULL;
 
        qjpeg_finish_decompress (&cinfo);
        qjpeg_destroy_decompress (&cinfo);
 
+       if(miplevel)
+               *miplevel -= submip;
+
        return image_buffer;
 
 error_caught:
@@ -833,6 +843,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height,
        cinfo.input_components = 3;
        qjpeg_set_defaults (&cinfo);
        qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), TRUE);
+       qjpeg_simple_progression (&cinfo);
 
        // turn off subsampling (to make text look better)
        cinfo.optimize_coding = 1;
@@ -954,7 +965,7 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int
 #endif
 
        //quality_guess = (100 * jpegsize - 41000) / (width*height) + 2; // fits random data
-       quality_guess   = (256 * jpegsize - 81920) / (width*height) - 8; // fits Nexuiz's map pictures
+       quality_guess   = (256 * jpegsize - 81920) / (width*height) - 8; // fits Nexuiz's/Xonotic's map pictures
 
        quality_guess = bound(0, quality_guess, 100);
        quality = bound(0, quality_guess + sv_writepicture_quality.integer, 100); // assume it can do 10 failed attempts
@@ -1032,6 +1043,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
        CompressedImageCacheItem *i;
 
        JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
+       PNG_OpenLibrary (); // for loading
 
        // No DLL = no JPEGs
        if (!jpeg_dll)
@@ -1048,7 +1060,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
        }
 
        // load the image
-       imagedata = loadimagepixelsbgra(imagename, true, false);
+       imagedata = loadimagepixelsbgra(imagename, true, false, false, NULL);
        if(!imagedata)
                return false;