mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-21 21:55:38 +00:00
Unified renderer initialization on RPi and other platforms! Woo, SDL2!
This commit is contained in:
Aloshi
parent
71f0dbf7e5
commit
10ed603f27
|
|
@ -82,7 +82,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
|||
message(SEND_ERROR "You need at least G++ 4.7 to compile EmulationStation!")
|
||||
endif()
|
||||
#set up compiler flags for GCC
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") #support C++11 for std::, optimize
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") #support C++11 for std::, optimize
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") #strip binary
|
||||
endif()
|
||||
|
||||
|
|
@ -251,15 +251,15 @@ set(ES_SOURCES
|
|||
SOURCE_GROUP(resources FILES ResourceUtil.cpp)
|
||||
|
||||
#add open gl specific sources
|
||||
if(${GLSystem} MATCHES "Desktop OpenGL")
|
||||
#if(${GLSystem} MATCHES "Desktop OpenGL")
|
||||
LIST(APPEND ES_SOURCES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/Renderer_init_sdlgl.cpp
|
||||
)
|
||||
else()
|
||||
LIST(APPEND ES_SOURCES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/Renderer_init_rpi.cpp
|
||||
)
|
||||
endif()
|
||||
#else()
|
||||
# LIST(APPEND ES_SOURCES
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/src/Renderer_init_rpi.cpp
|
||||
# )
|
||||
#endif()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
#define OS specific sources and headers
|
||||
|
|
|
|||
|
|
@ -1,235 +0,0 @@
|
|||
#include "Renderer.h"
|
||||
#include <iostream>
|
||||
#include "platform.h"
|
||||
#include <GLES/gl.h>
|
||||
#include <EGL/egl.h>
|
||||
#include <EGL/eglext.h>
|
||||
#include <SDL.h>
|
||||
#include "Log.h"
|
||||
|
||||
#ifdef _RPI_
|
||||
#include <bcm_host.h>
|
||||
#endif
|
||||
|
||||
namespace Renderer
|
||||
{
|
||||
SDL_Window* sdlWindow;
|
||||
|
||||
EGLDisplay display;
|
||||
EGLSurface surface;
|
||||
EGLContext context;
|
||||
EGLConfig config;
|
||||
|
||||
#ifdef _RPI_
|
||||
static EGL_DISPMANX_WINDOW_T nativewindow;
|
||||
#else
|
||||
NativeWindowType nativewindow;
|
||||
#endif
|
||||
|
||||
unsigned int display_width = 0;
|
||||
unsigned int display_height = 0;
|
||||
|
||||
unsigned int getScreenWidth() { return display_width; }
|
||||
unsigned int getScreenHeight() { return display_height; }
|
||||
|
||||
bool createSurface() //unsigned int display_width, unsigned int display_height)
|
||||
{
|
||||
LOG(LogInfo) << "Starting SDL...";
|
||||
|
||||
if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0)
|
||||
{
|
||||
LOG(LogError) << "Error initializing SDL!\n " << SDL_GetError() << "\n" << "Are you in the 'video', 'audio', and 'input' groups? Is X closed? Is your firmware up to date? Are you using at least the 192/64 memory split?";
|
||||
return false;
|
||||
}
|
||||
|
||||
sdlWindow = SDL_CreateWindow("EmulationStation",
|
||||
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
|
||||
display_width, display_height,
|
||||
0);
|
||||
|
||||
if(sdlWindow == NULL)
|
||||
{
|
||||
LOG(LogError) << "Error creating SDL window!" << SDL_GetError();
|
||||
return false;
|
||||
}
|
||||
|
||||
LOG(LogInfo) << "SDL Window created, creating EGL context...";
|
||||
|
||||
#ifdef _RPI_
|
||||
DISPMANX_ELEMENT_HANDLE_T dispman_element;
|
||||
DISPMANX_DISPLAY_HANDLE_T dispman_display;
|
||||
DISPMANX_UPDATE_HANDLE_T dispman_update;
|
||||
VC_RECT_T dst_rect;
|
||||
VC_RECT_T src_rect;
|
||||
#endif
|
||||
|
||||
display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
|
||||
if(display == EGL_NO_DISPLAY)
|
||||
{
|
||||
LOG(LogError) << "Error getting display!";
|
||||
return false;
|
||||
}
|
||||
|
||||
bool result = eglInitialize(display, NULL, NULL);
|
||||
if(result == EGL_FALSE)
|
||||
{
|
||||
LOG(LogError) << "Error initializing display!";
|
||||
return false;
|
||||
}
|
||||
|
||||
result = eglBindAPI(EGL_OPENGL_ES_API);
|
||||
if(result == EGL_FALSE)
|
||||
{
|
||||
LOG(LogError) << "Error binding API!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
static const EGLint config_attributes[] =
|
||||
{
|
||||
EGL_RED_SIZE, 8,
|
||||
EGL_GREEN_SIZE, 8,
|
||||
EGL_BLUE_SIZE, 8,
|
||||
EGL_ALPHA_SIZE, 8,
|
||||
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
|
||||
EGL_NONE
|
||||
};
|
||||
|
||||
GLint numConfigs;
|
||||
result = eglChooseConfig(display, config_attributes, &config, 1, &numConfigs);
|
||||
|
||||
if(result == EGL_FALSE)
|
||||
{
|
||||
LOG(LogError) << "Error choosing config!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
context = eglCreateContext(display, config, EGL_NO_CONTEXT, NULL);
|
||||
if(context == EGL_NO_CONTEXT)
|
||||
{
|
||||
LOG(LogError) << "Error getting context!\n " << eglGetError();
|
||||
return false;
|
||||
}
|
||||
|
||||
#ifdef _RPI_
|
||||
//get hardware info for screen/desktop from BCM interface
|
||||
if(!display_width || !display_height)
|
||||
{
|
||||
bool success = graphics_get_display_size(0, &display_width, &display_height); //0 = LCD
|
||||
|
||||
if(success < 0)
|
||||
{
|
||||
LOG(LogError) << "Error getting display size!";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#else
|
||||
//get hardware info for screen/desktop from SDL
|
||||
if(!display_width || !display_height)
|
||||
{
|
||||
const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo();
|
||||
if(videoInfo == NULL)
|
||||
{
|
||||
LOG(LogError) << "Error getting display size!";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
display_width = current_w;
|
||||
display_height = current_h;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
LOG(LogInfo) << "Resolution: " << display_width << "x" << display_height << "...";
|
||||
|
||||
#ifdef _RPI_
|
||||
dst_rect.x = 0; dst_rect.y = 0;
|
||||
dst_rect.width = display_width; dst_rect.height = display_height;
|
||||
|
||||
src_rect.x = 0; src_rect.y = 0;
|
||||
src_rect.width = display_width << 16; src_rect.height = display_height << 16;
|
||||
|
||||
dispman_display = vc_dispmanx_display_open(0); //0 = LCD
|
||||
dispman_update = vc_dispmanx_update_start(0);
|
||||
|
||||
dispman_element = vc_dispmanx_element_add(dispman_update, dispman_display, 0 /*layer*/, &dst_rect, 0 /*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0 /*clamp*/, DISPMANX_NO_ROTATE /*transform*/);
|
||||
|
||||
nativewindow.element = dispman_element;
|
||||
nativewindow.width = display_width; nativewindow.height = display_height;
|
||||
vc_dispmanx_update_submit_sync(dispman_update);
|
||||
#endif
|
||||
|
||||
surface = eglCreateWindowSurface(display, config, &nativewindow, NULL);
|
||||
if(surface == EGL_NO_SURFACE)
|
||||
{
|
||||
LOG(LogError) << "Error creating window surface!";
|
||||
return false;
|
||||
}
|
||||
|
||||
result = eglMakeCurrent(display, surface, surface, context);
|
||||
if(result == EGL_FALSE)
|
||||
{
|
||||
LOG(LogError) << "Error with eglMakeCurrent!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
LOG(LogInfo) << "Created surface successfully!";
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void swapBuffers()
|
||||
{
|
||||
eglSwapBuffers(display, surface);
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
|
||||
void destroySurface()
|
||||
{
|
||||
eglSwapBuffers(display, surface);
|
||||
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|
||||
eglDestroySurface(display, surface);
|
||||
eglDestroyContext(display, context);
|
||||
eglTerminate(display);
|
||||
|
||||
display = EGL_NO_DISPLAY;
|
||||
surface = EGL_NO_SURFACE;
|
||||
context = EGL_NO_CONTEXT;
|
||||
|
||||
SDL_DestroyWindow(sdlWindow);
|
||||
sdlWindow = NULL;
|
||||
SDL_Quit();
|
||||
}
|
||||
|
||||
bool init(int w, int h)
|
||||
{
|
||||
if(w)
|
||||
display_width = w;
|
||||
if(h)
|
||||
display_height = h;
|
||||
|
||||
bool createdSurface = createSurface();
|
||||
|
||||
if(!createdSurface)
|
||||
return false;
|
||||
|
||||
glViewport(0, 0, display_width, display_height);
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glOrthof(0, display_width, display_height, 0, -1.0, 1.0);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
|
||||
onInit();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void deinit()
|
||||
{
|
||||
onDeinit();
|
||||
destroySurface();
|
||||
}
|
||||
};
|
||||
|
|
@ -10,6 +10,10 @@
|
|||
#include "EmulationStation.h"
|
||||
#include "Settings.h"
|
||||
|
||||
#ifdef USE_OPENGL_ES
|
||||
#define glOrtho glOrthof
|
||||
#endif
|
||||
|
||||
namespace Renderer
|
||||
{
|
||||
static bool initialCursorState;
|
||||
|
|
@ -41,7 +45,7 @@ namespace Renderer
|
|||
//SDL_GL_SetSwapInterval(1); //0 for immediate updates, 1 for updates synchronized with the vertical retrace, -1 for late swap tearing
|
||||
|
||||
SDL_DisplayMode dispMode;
|
||||
SDL_GetDisplayMode(0, 0, &dispMode);
|
||||
SDL_GetDesktopDisplayMode(0, &dispMode);
|
||||
if(display_width == 0)
|
||||
display_width = dispMode.w;
|
||||
if(display_height == 0)
|
||||
|
|
|
|||
|
|
@ -111,10 +111,6 @@ bool verifyHomeFolderExists()
|
|||
void onExit()
|
||||
{
|
||||
Log::close();
|
||||
|
||||
#ifdef _RPI_
|
||||
bcm_host_deinit();
|
||||
#endif
|
||||
}
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
|
|
@ -129,10 +125,6 @@ int main(int argc, char* argv[])
|
|||
if(!verifyHomeFolderExists())
|
||||
return 1;
|
||||
|
||||
#ifdef _RPI_
|
||||
bcm_host_init();
|
||||
#endif
|
||||
|
||||
//start the logger
|
||||
Log::open();
|
||||
LOG(LogInfo) << "EmulationStation - " << PROGRAM_VERSION_STRING;
|
||||
|
|
|
|||
Loading…
Reference in a new issue