Aaa

Android.mk

@@ -88,17 +88,24 @@ LOCAL_SRC_FILES := \
 	src/glx/lookup.c \
 	src/glx/gbm.c \
 	src/glx/streaming.c \
+	src/gl/libtxc_dxtn/txc_compress_dxtn.c \
 
-LOCAL_CFLAGS += -g -std=gnu99 -funwind-tables -O3 -fvisibility=hidden -include include/android_debug.h
+LOCAL_CFLAGS += -std=gnu99 -funwind-tables -O3 -fvisibility=hidden -include include/android_debug.h
 LOCAL_CFLAGS += -DNOX11
 LOCAL_CFLAGS += -DNO_GBM
-#LOCAL_CFLAGS += -DNO_INIT_CONSTRUCTOR
+LOCAL_CFLAGS += -DNO_INIT_CONSTRUCTOR=ON
+LOCAL_CFLAGS += -DNOEGL=ON
+LOCAL_CFLAGS += -DNO_LOADER=ON
 LOCAL_CFLAGS += -DDEFAULT_ES=2
+LOCAL_CFLAGS += -Wno-typedef-redefinition -Wno-dangling-else
+LOCAL_CFLAGS += -Dasm=__asm__ -Dvolatile=__volatile__
+LOCAL_CFLAGS += -include include/gl4esinit.h
+
 //TODO: maybe temporary?
 LOCAL_CFLAGS += -Wno-typedef-redefinition -Wno-dangling-else
 
 LOCAL_LDLIBS := -llog
-#building as a static lib
+#building as a shared lib
 
-LOCAL_CFLAGS += -DSTATICLIB
-include $(BUILD_STATIC_LIBRARY)
+LOCAL_CFLAGS += -DSHAREDLIB
+include $(BUILD_SHARED_LIBRARY)

CMakeLists.txt

@@ -102,7 +102,7 @@ endif()
 # Android
 if(ANDROID)
     add_definitions(-DANDROID)
-    add_definitions(-DNOX11 -DNO_GBM -DDEFAULT_ES=2)
+    add_definitions(-DNOX11 -DNO_GBM -DDEFAULT_ES=2 -o libGL.so)
 endif()
 
 if(USE_ANDROID_LOG)
@@ -192,13 +192,13 @@ if(NOT WIN32_MSVC)
     if(NOT WIN32_PLATFORM)
        add_definitions(-fvisibility=hidden)
     else()
-       set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--exclude-all-symbols,--kill-at")
+       set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--exclude-all-symbols,--kill-at -latomic -no-canonical-prefixes -Wl,--gc-sections -Wl,--build-id=sha1 -Wl,--no-dangling-else -Wl,--no-rosegment -Wl,--no-undefined -Wl,--fatal-warnings -Wl,--no-undefined-version -llog -landroid -lc -lm -o libGL.so")
     endif()
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
     add_definitions(-Wno-deprecated-declarations) #strdup
     add_definitions(-Wno-unused-function -Wno-unused-variable -Wno-dangling-else)
     add_definitions(-Wno-implicit-const-int-float-conversion)
-    add_definitions(-Wno-visibility)
+    add_definitions(-Wno-visibility -Wno-logical-not-parentheses)
 else()
     if(CMAKE_C_COMPILER_ID MATCHES "Intel")
         add_definitions(-wd1786 -wd589 -wd537 -wd118 -wd2722)

include/GL/glext.h

@@ -1507,7 +1507,7 @@ extern "C" {
 #define GL_CLAMP_READ_COLOR_ARB           0x891C
 #define GL_FIXED_ONLY_ARB                 0x891D
 #endif
-
+  
 #ifndef GL_ARB_half_float_pixel
 #define GL_HALF_FLOAT_ARB                 0x140B
 #endif
@@ -1663,7 +1663,7 @@ extern "C" {
 /* reuse GL_MAX_VARYING_COMPONENTS */
 /* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
 #endif
-
+  
 #ifndef GL_ARB_half_float_vertex
 #define GL_HALF_FLOAT                     0x140B
 #endif
@@ -4070,7 +4070,7 @@ extern "C" {
 #define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
 #define GL_PROGRAM_ERROR_STRING_NV        0x8874
 #endif
-
+  
 #ifndef GL_NV_half_float
 #define GL_HALF_FLOAT_NV                  0x140B
 #endif

src/CMakeLists.txt

@@ -3,9 +3,9 @@ include_directories(util)
 #file(GLOB_RECURSE GL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gl/*.c)
 SET(GL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbconverter.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbgenerator.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbhelper.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbparser.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbgenerator.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbhelper.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbparser.c
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/array.c
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/blit.c
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/blend.c
@@ -66,23 +66,26 @@ SET(GL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/texture_3d.c
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/uniform.c
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/vertexattrib.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/gl4eswraps.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/gles.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/glstub.c
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/math/matheval.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/gl4eswraps.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/gles.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/wrap/glstub.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/math/matheval.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/libtxc_dxtn/txc_compress_dxtn.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/libtxc_dxtn/txc_dxtn.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/libtxc_dxtn/txc_fetch_dxtn.c
 )
 
 SET(GL_H
     ${CMAKE_CURRENT_SOURCE_DIR}/../version.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbconverter.h
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbgenerator.h
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbhelper.h
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/arbparser.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbgenerator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbhelper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/arbparser.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/array.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/blend.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/blit.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/buffers.h
-	${CMAKE_CURRENT_SOURCE_DIR}/gl/build_info.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gl/build_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/const.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/debug.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gl/decompress.h
@@ -144,11 +147,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT NO_LOADER)
     list(APPEND GL_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/glx/hardext.c
         ${CMAKE_CURRENT_SOURCE_DIR}/glx/gbm.c
-	    ${CMAKE_CURRENT_SOURCE_DIR}/glx/glx.c
-	    ${CMAKE_CURRENT_SOURCE_DIR}/glx/glx_stubs.c
-	    ${CMAKE_CURRENT_SOURCE_DIR}/glx/lookup.c
+	${CMAKE_CURRENT_SOURCE_DIR}/glx/glx.c
+	${CMAKE_CURRENT_SOURCE_DIR}/glx/glx_stubs.c
+	${CMAKE_CURRENT_SOURCE_DIR}/glx/lookup.c
         ${CMAKE_CURRENT_SOURCE_DIR}/glx/rpi.c
-	    ${CMAKE_CURRENT_SOURCE_DIR}/glx/streaming.c
+	${CMAKE_CURRENT_SOURCE_DIR}/glx/streaming.c
         ${CMAKE_CURRENT_SOURCE_DIR}/glx/utils.c
     )
     list(APPEND GL_H
@@ -221,14 +224,17 @@ else()
     endif()
 
     if(CMAKE_SHARED_LIBRARY_SUFFIX MATCHES ".so")
-        set_target_properties(GL PROPERTIES SUFFIX ".so.1")
+        set_target_properties(GL PROPERTIES SUFFIX ".so")
     endif()
     install(TARGETS GL
       LIBRARY
-      DESTINATION "/usr/lib/gl4es/"
+      DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/"
     )
-    install(FILES "../include/gl4esinit.h" "../include/gl4eshint.h"
-      DESTINATION "/usr/include/gl4es/"
+    install(DIRECTORY "../include/"
+      DESTINATION "${CMAKE_INSTALL_PREFIX}/include/gl4es"      
+    )
+    install(DIRECTORY "../include/"
+      DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
     )
 endif()
 
@@ -249,7 +255,7 @@ if(EGL_WRAPPER)
         target_link_libraries(EGL ${log-lib})
     endif()
     if(CMAKE_SHARED_LIBRARY_SUFFIX MATCHES ".so")
-        set_target_properties(EGL PROPERTIES SUFFIX ".so.1")
+        set_target_properties(EGL PROPERTIES SUFFIX ".so")
     endif()
 endif()
 

src/gl/const.h

@@ -188,6 +188,7 @@
 #define GL_INTENSITY16F                0x881D
 #define GL_INTENSITY32F                0x8817
 #define GL_RGB10_A2                    0x8059
+#define GL_R16F                        0x822D
 #define GL_RGBA16F                     0x881A
 #define GL_RGB16F                      0x881B
 #define GL_RGBA32F                     0x8814

src/gl/debug.c

@@ -427,4 +427,4 @@ void CheckGLError(int fwd) {
         if(fwd)
             errorShim(err);
     }
-}
+}

src/gl/enum_info.h

@@ -168,4 +168,4 @@ static inline const GLboolean valid_vertex_type(GLenum type) {
     }
 }
 
-#endif // _GL4ES_ENUM_INFO_H
+#endif // _GL4ES_ENUM_INFO_H

src/gl/fpe.h

@@ -217,6 +217,7 @@ typedef struct fpe_state_s {
     unsigned int blendeqalpha:3;
     uint16_t     vertex_prg_id;          // Id of vertex program currently binded (0 most of the time), 16bits is more than enough...
     uint16_t     fragment_prg_id;        // Id of fragment program currently binded (0 most of the time)
+    int16_t gamma;
 } fpe_state_t;
 #pragma pack()
 

src/gl/fpe_shader.c

@@ -186,7 +186,7 @@ const char* const* fpe_VertexShader(shaderconv_need_t* need, fpe_state_t *state)
     int cm_back_nullexp = state->cm_back_nullexp;
     int texgens = 0;
     int texmats = 0;
-    const char* fogp = hardext.highp?"highp":"mediump";
+    const char* fogp = "highp";
 
     for (int i=0; i<hardext.maxtex; ++i) {
         if(state->texgen[i].texgen_s || state->texgen[i].texgen_t || state->texgen[i].texgen_r || state->texgen[i].texgen_q)
@@ -837,7 +837,7 @@ const char* const* fpe_FragmentShader(shaderconv_need_t* need, fpe_state_t *stat
     int texenv_combine = 0;
     int texturing = 0;
     char buff[1024];
-    const char* fogp = hardext.highp?"highp":"mediump";
+    const char* fogp = "highp";
 
 
     strcpy(shad, fpeshader_signature);
@@ -1376,7 +1376,8 @@ const char* const* fpe_FragmentShader(shaderconv_need_t* need, fpe_state_t *stat
                 sprintf(buff, "%s float FogF = clamp(exp(-(gl_Fog.density * fog_c)*(gl_Fog.density * fog_c)), 0., 1.);\n", fogp);
                 break;
             case FPE_FOG_LINEAR:
-                sprintf(buff, "%s float FogF = clamp((gl_Fog.end - fog_c) %s, 0., 1.);\n", fogp, hardext.highp?"* gl_Fog.scale":"/ (gl_Fog.end - gl_Fog.start)");
+                //sprintf(buff, "%s float FogF = clamp((gl_Fog.end - fog_c) %s, 0., 1.);\n", fogp, hardext.highp?"* gl_Fog.scale":"/ (gl_Fog.end - gl_Fog.start)");
+                sprintf(buff, "%s float FogF = clamp((gl_Fog.end - fog_c) * gl_Fog.scale, 0., 1.);\n", fogp);
                 break;
         }
         ShadAppend(buff);
@@ -1618,6 +1619,11 @@ const char* const* fpe_FragmentShader(shaderconv_need_t* need, fpe_state_t *stat
         }
     }
 
+    if (state->gamma) {
+        sprintf(buff, "fColor.rgb = pow(fColor.rgb, vec3(1.0 / %.3f));\n", state->gamma / 100.0);
+        ShadAppend(buff);
+    }
+
     //done
     ShadAppend("gl_FragColor = fColor;\n");
     ShadAppend("}");

src/gl/getter.c

@@ -110,11 +110,6 @@ void BuildExtensionsList() {
                 "GL_EXT_draw_range_elements "
                 "GL_EXT_bgra "
                 "GL_ARB_texture_compression "
-                "GL_EXT_texture_compression_s3tc "
-                "GL_OES_texture_compression_S3TC "
-                "GL_EXT_texture_compression_dxt1 "
-                "GL_EXT_texture_compression_dxt3 "
-                "GL_EXT_texture_compression_dxt5 "
                 "GL_ARB_point_parameters "
                 "GL_EXT_point_parameters "
                 "GL_EXT_stencil_wrap "
@@ -133,6 +128,15 @@ void BuildExtensionsList() {
                 "GL_NV_blend_square "
 //                "GL_EXT_blend_logic_op "
 				);
+
+        if (globals4es.dxt != 2)
+            strcat(extensions, "GL_EXT_texture_compression_s3tc "
+                "GL_OES_texture_compression_S3TC "
+                "GL_EXT_texture_compression_dxt1 "
+                "GL_EXT_texture_compression_dxt3 "
+                "GL_EXT_texture_compression_dxt5 ");
+
+
         if(!globals4es.notexrect)
             strcat(extensions, "GL_ARB_texture_rectangle ");
         if(globals4es.vabgra)
@@ -177,16 +181,30 @@ void BuildExtensionsList() {
         if(hardext.floattex || (globals4es.floattex==2)) {
             strcat(extensions, "GL_EXT_texture_float ");
             strcat(extensions, "GL_ARB_texture_float ");
+            strcat(extensions, "GL_OES_texture_float ");
+        }
+        if(hardext.floattexlinear || (globals4es.floattex==2)) {
+            strcat(extensions, "GL_EXT_texture_float_linear ");
+            strcat(extensions, "GL_OES_texture_float_linear ");
         }
         if(hardext.halffloattex || (globals4es.floattex==2)) {
             strcat(extensions, "GL_EXT_texture_half_float ");
+            strcat(extensions, "GL_OES_texture_half_float ");
+        }
+        if(hardext.halffloattexlinear || (globals4es.floattex==2)) {
+            strcat(extensions, "GL_EXT_texture_half_float_linear ");
+            strcat(extensions, "GL_OES_texture_half_float_linear ");
         }
         if(hardext.floatfbo || (globals4es.floattex==2)) {
             strcat(extensions, "GL_EXT_color_buffer_float ");
         }
         if(hardext.halffloatfbo || (globals4es.floattex==2)) {
             strcat(extensions, "GL_EXT_color_buffer_half_float ");
         }
+        if(hardext.clipcontrol) {
+            strcat(extensions, "GL_ARB_clip_control ");
+            strcat(extensions, "GL_EXT_clip_control ");
+        }
         if(hardext.depthtex) {
             strcat(extensions, "GL_EXT_depth_texture ");
             strcat(extensions, "GL_ARB_depth_texture ");

src/gl/hint.c

@@ -5,6 +5,7 @@
 #include "loader.h"
 #include "gl4es.h"
 #include "glstate.h"
+#include "fpe_cache.h"
 
 #ifdef PANDORA
 void pandora_set_gamma();
@@ -132,4 +133,4 @@ void APIENTRY_GL4ES gl4es_glHint(GLenum pname, GLenum mode) {
             gles_glHint(pname, mode);
     }
 }
-AliasExport(void,glHint,,(GLenum pname, GLenum mode));
+AliasExport(void,glHint,,(GLenum pname, GLenum mode));

src/gl/init.c

@@ -121,6 +121,25 @@ void initialize_gl4es() {
     env(LIBGL_XREFRESH, globals4es.xrefresh, "xrefresh will be called on cleanup");
     env(LIBGL_STACKTRACE, globals4es.stacktrace, "stacktrace will be printed on crash");
 
+    switch(ReturnEnvVarInt("LIBGL_DXT")) {
+    	case 1:
+        SHUT_LOGD("forcing software DXT decompression\n");
+        globals4es.dxt = 1;
+    	  break;
+    	case 2:
+        SHUT_LOGD("not exposing DXT support\n");
+        globals4es.dxt = 2;
+    	  break;
+    	case 3:
+        SHUT_LOGD("handling DXT as is\n");
+        globals4es.dxt = 3;
+    	  break;
+    	default:
+        SHUT_LOGD("using hardware DXT if supported + software fallback\n");
+        globals4es.dxt = 0;
+    	  break;
+    }
+
 
     switch(ReturnEnvVarInt("LIBGL_FB")) {
     	case 1:
@@ -626,7 +645,7 @@ void initialize_gl4es() {
     env(LIBGL_NOES2COMPAT, globals4es.noes2, "Don't expose GLX_EXT_create_context_es2_profile extension");
     env(LIBGL_NORMALIZE, globals4es.normalize, "Force normals to be normalized on FPE shaders");
 
-    globals4es.dbgshaderconv=ReturnEnvVarIntDef("LIBGL_DBGSHADERCONV",0);
+    globals4es.dbgshaderconv=1;//ReturnEnvVarIntDef("LIBGL_DBGSHADERCONV",0);
     if(globals4es.dbgshaderconv) {
       if(globals4es.dbgshaderconv==1)
           globals4es.dbgshaderconv=15;
@@ -677,6 +696,7 @@ void initialize_gl4es() {
         if(globals4es.nopsa==0) {
             cwd[0]='\0';
             // TODO: What to do on ANDROID and EMSCRIPTEN?
+/*
             const char* custom_psa = GetEnvVar("LIBGL_PSA_FOLDER");
 #ifdef __linux__
             const char* home = GetEnvVar("HOME");
@@ -693,8 +713,16 @@ void initialize_gl4es() {
             else
               strcpy(cwd, "PROGDIR:");
 #endif
+
+*/
+
+            strcpy(cwd, GetEnvVar("OPENMW_USER_FILE_STORAGE"));
+
             if(strlen(cwd)) {
-                strcat(cwd, ".gl4es.psa");
+                if(globals4es.nohighp)
+                    strcat(cwd, ".gl4es.psa-mediump");
+                else
+                    strcat(cwd, ".gl4es.psa-highp");
                 fpe_InitPSA(cwd);
                 fpe_readPSA();
             }

src/gl/init.h

@@ -10,6 +10,7 @@ typedef struct _globals4es {
  int mergelist;
  int xrefresh;
  int stacktrace;
+ int dxt;
  int usefb;
  int usegbm;
  int usefbo;