mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-02-24 15:12:23 +01:00
4e2eb23835
byuu says: Changelog: - added Cocoa target: higan can now be compiled for OS X Lion [Cydrak, byuu] - SNES/accuracy profile hires color blending improvements - fixes Marvelous text [AWJ] - fixed a slight bug in SNES/SA-1 VBR support caused by a typo - added support for multi-pass shaders that can load external textures (requires OpenGL 3.2+) - added game library path (used by ananke->Import Game) to Settings->Advanced - system profiles, shaders and cheats database can be stored in "all users" shared folders now (eg /usr/share on Linux) - all configuration files are in BML format now, instead of XML (much easier to read and edit this way) - main window supports drag-and-drop of game folders (but not game files / ZIP archives) - audio buffer clears when entering a modal loop on Windows (prevents audio repetition with DirectSound driver) - a substantial amount of code clean-up (probably the biggest refactoring to date) One highly desired target for this release was to default to the optimal drivers instead of the safest drivers, but because AMD drivers don't seem to like my OpenGL 3.2 driver, I've decided to postpone that. AMD has too big a market share. Hopefully with v093 officially released, we can get some public input on what AMD doesn't like.
83 lines
1.9 KiB
C++
83 lines
1.9 KiB
C++
#if defined(PLATFORM_X)
|
|
#include <GL/gl.h>
|
|
#include <GL/glx.h>
|
|
#define glGetProcAddress(name) (*glXGetProcAddress)((const GLubyte*)(name))
|
|
#elif defined(PLATFORM_OSX)
|
|
#include <OpenGL/gl.h>
|
|
#include <OpenGL/gl3.h>
|
|
#elif defined(PLATFORM_WIN)
|
|
#include <GL/gl.h>
|
|
#include <GL/glext.h>
|
|
#define glGetProcAddress(name) wglGetProcAddress(name)
|
|
#else
|
|
#error "ruby::OpenGL: unsupported platform"
|
|
#endif
|
|
|
|
namespace ruby {
|
|
|
|
#include "bind.hpp"
|
|
#include "shaders.hpp"
|
|
#include "utility.hpp"
|
|
|
|
struct OpenGL;
|
|
|
|
struct OpenGLTexture {
|
|
GLuint texture = 0;
|
|
unsigned width = 0;
|
|
unsigned height = 0;
|
|
GLuint format = GL_RGBA8;
|
|
GLuint filter = GL_LINEAR;
|
|
GLuint wrap = GL_CLAMP_TO_BORDER;
|
|
};
|
|
|
|
struct OpenGLSurface : OpenGLTexture {
|
|
GLuint program = 0;
|
|
GLuint framebuffer = 0;
|
|
GLuint vao = 0;
|
|
GLuint vbo[3] = {0, 0, 0};
|
|
GLuint vertex = 0;
|
|
GLuint geometry = 0;
|
|
GLuint fragment = 0;
|
|
uint32_t* buffer = nullptr;
|
|
|
|
void allocate();
|
|
void size(unsigned width, unsigned height);
|
|
void release();
|
|
void render(unsigned sourceWidth, unsigned sourceHeight, unsigned targetWidth, unsigned targetHeight);
|
|
};
|
|
|
|
struct OpenGLProgram : OpenGLSurface {
|
|
//configuration
|
|
unsigned phase = 0; //frame counter
|
|
unsigned modulo = 0; //frame counter modulus
|
|
unsigned absoluteWidth = 0;
|
|
unsigned absoluteHeight = 0;
|
|
double relativeWidth = 0;
|
|
double relativeHeight = 0;
|
|
vector<OpenGLTexture> pixmaps;
|
|
|
|
void bind(OpenGL* instance, const Markup::Node& node, const string& pathname);
|
|
void release();
|
|
};
|
|
|
|
struct OpenGL : OpenGLProgram {
|
|
vector<OpenGLProgram> programs;
|
|
|
|
GLuint inputFormat = GL_UNSIGNED_INT_8_8_8_8_REV;
|
|
unsigned outputWidth = 0;
|
|
unsigned outputHeight = 0;
|
|
|
|
void shader(const char* pathname);
|
|
bool lock(uint32_t*& data, unsigned& pitch);
|
|
void clear();
|
|
void refresh();
|
|
bool init();
|
|
void term();
|
|
};
|
|
|
|
#include "surface.hpp"
|
|
#include "program.hpp"
|
|
#include "main.hpp"
|
|
|
|
}
|