diff --git a/ChangeLog b/ChangeLog index c1d30ca59..e800bc673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,7 +38,6 @@ Graphics: . Move entire GE to core emu. . Move OpenGL renderer to emu core for optional use by platforms, removing ogl_collector. Now every platform shares the same 3d code. . Reorganize 3d code to defer rendering to after 3d vblank. Eliminates tearing, and texturing artifacts. [zeromus] - . Add optional fragment shading pipeline (more precision) [luigi__] . Move lighting model to software instead of using opengl's fixed function model [zeromus] . Render shadow volumes; toon shading and highlight table [zeromus, luigi__] . Added texture caching! big speed up. [CrazyMax] diff --git a/src/OGLRender.cpp b/src/OGLRender.cpp index 8f564a305..c982b8484 100644 --- a/src/OGLRender.cpp +++ b/src/OGLRender.cpp @@ -426,7 +426,9 @@ static char OGLInit(void) #endif /* Create the shaders */ - createShaders(); + //as a hack for 0.9 release, we're disabling shaders. + hasShaders = false; + //createShaders(); /* Assign the texture units : 0 for main textures, 1 for toon table */ /* Also init the locations for some variables in the shaders */ diff --git a/src/types.h b/src/types.h index c8042cf38..8221ab097 100644 --- a/src/types.h +++ b/src/types.h @@ -21,7 +21,7 @@ #define TYPES_HPP #define DESMUME_NAME "DeSmuME" -#define DESMUME_VERSION_STRING "0.9-interim" +#define DESMUME_VERSION_STRING "0.9" #define DESMUME_VERSION_NUMERIC 90000 #define DESMUME_NAME_AND_VERSION DESMUME_NAME " " DESMUME_VERSION_STRING " " VERSION