mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-20 07:01:50 +02:00
Update to v094r29 release.
byuu says: Note: for Windows users, please go to nall/intrinsics.hpp line 60 and correct the typo from "DISPLAY_WINDOW" to "DISPLAY_WINDOWS" before compiling, otherwise things won't work at all. This will be a really major WIP for the core SNES emulation, so please test as thoroughly as possible. I rewrote the 65816 CPU core's dispatcher from a jump table to a switch table. This was so that I could pass class variables as parameters to opcodes without crazy theatrics. With that, I killed the regs.r[N] stuff, the flag_t operator|=, &=, ^= stuff, and all of the template versions of opcodes. I also removed some stupid pointless flag tests in xcn and pflag that would always be true. I sure hope that AWJ is happy with this; because this change was so that my flag assignments and branch tests won't need to build regs.P into a full 8-bit variable anymore. It does of course incur a slight performance hit when you pass in variables by-value to functions, but it should help with binary size (and thus cache) by reducing a lot of extra functions. (I know I could have used template parameters for some things even with a switch table, but chose not to for the aforementioned reasons.) Overall, it's about a ~1% speedup from the previous build. The CPU core instructions were never a bottleneck, but I did want to fix the P flag building stuff because that really was a dumb mistake v_v'
This commit is contained in:
@@ -1,8 +1,4 @@
|
||||
#if defined(PLATFORM_MACOSX)
|
||||
static bool OpenGLBind() {
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
#if defined(DISPLAY_WINDOWS) || defined(DISPLAY_XORG)
|
||||
PFNGLCREATEPROGRAMPROC glCreateProgram = nullptr;
|
||||
PFNGLDELETEPROGRAMPROC glDeleteProgram = nullptr;
|
||||
PFNGLUSEPROGRAMPROC glUseProgram = nullptr;
|
||||
@@ -43,12 +39,17 @@ PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers = nullptr;
|
||||
PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers = nullptr;
|
||||
PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer = nullptr;
|
||||
PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D = nullptr;
|
||||
#endif
|
||||
#if defined(DISPLAY_WINDOWS)
|
||||
PFNGLACTIVETEXTUREPROC glActiveTexture = nullptr;
|
||||
#endif
|
||||
|
||||
static bool OpenGLBind() {
|
||||
#define bind(prototype, function) \
|
||||
function = (prototype)glGetProcAddress(#function); \
|
||||
if(function == nullptr) return false
|
||||
|
||||
#if defined(DISPLAY_WINDOWS) || defined(DISPLAY_XORG)
|
||||
bind(PFNGLCREATEPROGRAMPROC, glCreateProgram);
|
||||
bind(PFNGLDELETEPROGRAMPROC, glDeleteProgram);
|
||||
bind(PFNGLUSEPROGRAMPROC, glUseProgram);
|
||||
@@ -89,9 +90,12 @@ static bool OpenGLBind() {
|
||||
bind(PFNGLDELETEFRAMEBUFFERSPROC, glDeleteFramebuffers);
|
||||
bind(PFNGLBINDFRAMEBUFFERPROC, glBindFramebuffer);
|
||||
bind(PFNGLFRAMEBUFFERTEXTURE2DPROC, glFramebufferTexture2D);
|
||||
#endif
|
||||
#if defined(DISPLAY_WINDOWS)
|
||||
bind(PFNGLACTIVETEXTUREPROC, glActiveTexture);
|
||||
#endif
|
||||
|
||||
#undef bind
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
@@ -1,11 +1,11 @@
|
||||
#if defined(PLATFORM_XORG)
|
||||
#if defined(DISPLAY_XORG)
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glx.h>
|
||||
#define glGetProcAddress(name) (*glXGetProcAddress)((const GLubyte*)(name))
|
||||
#elif defined(PLATFORM_MACOSX)
|
||||
#elif defined(DISPLAY_QUARTZ)
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/gl3.h>
|
||||
#elif defined(PLATFORM_WINDOWS)
|
||||
#elif defined(DISPLAY_WINDOWS)
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glext.h>
|
||||
#define glGetProcAddress(name) wglGetProcAddress(name)
|
||||
|
Reference in New Issue
Block a user