0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable OpenGL rendering.

Browse source
This commit is contained in:
Boldizsár Lipka 2014-06-27 11:57:49 +02:00
parent 9cce856aa0
commit fba9a360cc
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/video.cpp
View file

@ -28,6 +28,7 @@
#include "sdl/rect.hpp"
#include "sdl/window.hpp"
#include "video.hpp"
#include "SDL_gpu/SDL_gpu/SDL_gpu.h"
#include <boost/foreach.hpp>
@ -42,6 +43,7 @@ static lg::log_domain log_display("display");
namespace {
bool fullScreen = false;
int disallow_resize = 0;
GPU_Target *render_target;
}
void resize_monitor::process(events::pump_info &info) {
if(info.resize_dimensions.first >= preferences::min_allowed_width()
@ -67,6 +69,7 @@ static unsigned int get_flags(unsigned int flags)
#if !SDL_VERSION_ATLEAST(2, 0, 0)
// SDL under Windows doesn't seem to like hardware surfaces
// for some reason.
flags |= SDL_OPENGLBLIT;
#if !(defined(_WIN32) || defined(__APPLE__))
flags |= SDL_HWSURFACE;
#endif
@ -235,6 +238,13 @@ bool non_interactive()
#endif
}
GPU_Target *get_render_target()
{
return render_target;
}
surface display_format_alpha(surface surf)
{
#if !SDL_VERSION_ATLEAST(2, 0, 0)
@ -333,10 +343,10 @@ CVideo::CVideo(FAKE_TYPES type) : mode_changed_(false), bpp_(0), fake_screen_(fa
void CVideo::initSDL()
{
const int res = SDL_InitSubSystem(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
render_target = GPU_Init(1200, 700, SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
if(res < 0) {
ERR_DP << "Could not initialize SDL_video: " << SDL_GetError() << std::endl;
if(render_target == NULL) {
ERR_DP << "Could not initialize window: " << SDL_GetError() << std::endl;
throw CVideo::error();
}
}
@ -703,3 +713,4 @@ void CVideo::clear_all_help_strings()
{
clear_help_string(help_string_);
}

4
src/video.hpp
View file

@ -35,10 +35,14 @@ struct surface;
#define SDL_APPACTIVE 0x04 /**< The application is active */
#endif
struct GPU_Target;
GPU_Target *get_render_target();
surface display_format_alpha(surface surf);
surface get_video_surface();
SDL_Rect screen_area();
bool non_interactive();
//which areas of the screen will be updated when the buffer is flipped?