ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows Port: 

- Fix compiling issues. (Regression from r5162. Fixes bug #1468.)
- Fix crashing issue when selecting the OpenGL 3.2 renderer. Failure to init should now fallback properly. (Regression from r5180. Fixes bug #1470.)
This commit is contained in:
rogerman 2015-05-04 22:52:32 +00:00
parent d5bb6fd79e
commit 42a1f7b9f5
6 changed files with 12967 additions and 14610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/OGLRender_3_2.cpp
View File

@ -91,13 +91,13 @@ void OGLLoadEntryPoints_3_2()
INITOGLEXT(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers) // Promote to core version INITOGLEXT(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers) // Promote to core version
// UBO // UBO
OGLEXT(PFNGLGETUNIFORMBLOCKINDEXPROC, glGetUniformBlockIndex) INITOGLEXT(PFNGLGETUNIFORMBLOCKINDEXPROC, glGetUniformBlockIndex)
OGLEXT(PFNGLUNIFORMBLOCKBINDINGPROC, glUniformBlockBinding) INITOGLEXT(PFNGLUNIFORMBLOCKBINDINGPROC, glUniformBlockBinding)
OGLEXT(PFNGLBINDBUFFERBASEPROC, glBindBufferBase) INITOGLEXT(PFNGLBINDBUFFERBASEPROC, glBindBufferBase)
OGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv) INITOGLEXT(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv)
// TBO // TBO
OGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer) INITOGLEXT(PFNGLTEXBUFFERPROC, glTexBuffer)
} }
// Vertex shader for geometry, GLSL 1.50 // Vertex shader for geometry, GLSL 1.50

2
desmume/src/windows/File_Extractor/fex/Rar_Extractor.h
View File

@ -5,7 +5,7 @@
#define RAR_EXTRACTOR_H #define RAR_EXTRACTOR_H
#include "File_Extractor.h" #include "File_Extractor.h"
#include "unrar/unrar.h" #include "../unrar/unrar.h"
class Rar_Extractor : public File_Extractor { class Rar_Extractor : public File_Extractor {
public: public:

6
desmume/src/windows/File_Extractor/fex/Zip7_Extractor.cpp
View File

@ -3,9 +3,9 @@
#include "Zip7_Extractor.h" #include "Zip7_Extractor.h"
extern "C" { extern "C" {
#include "7z_C/7z.h" #include "../7z_C/7z.h"
#include "7z_C/7zAlloc.h" #include "../7z_C/7zAlloc.h"
#include "7z_C/7zCrc.h" #include "../7z_C/7zCrc.h"
} }
#include <time.h> #include <time.h>

5559
desmume/src/windows/GL/glcorearb.h
View File

File diff suppressed because it is too large Load Diff

20848
desmume/src/windows/GL/glext.h
View File

File diff suppressed because it is too large Load Diff

1134
desmume/src/windows/GL/wglext.h
View File

File diff suppressed because it is too large Load Diff