:<
This commit is contained in:
parent
288441617b
commit
284a4f39ad
|
@ -15,7 +15,7 @@ fi
|
||||||
cd win32build
|
cd win32build
|
||||||
|
|
||||||
# TODO: potential Arch-ism?
|
# TODO: potential Arch-ism?
|
||||||
i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2 -march=i686" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -march=i686" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=OFF -DWITH_RENDER_DX11=ON .. || exit 1
|
i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2 -march=i586" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -march=i586" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=OFF -DWITH_RENDER_DX11=ON -DUSE_BACKWARD=OFF .. || exit 1
|
||||||
make -j8 || exit 1
|
make -j8 || exit 1
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
|
@ -6513,10 +6513,12 @@ bool FurnaceGUI::init() {
|
||||||
logW("could not list render drivers! %s",SDL_GetError());
|
logW("could not list render drivers! %s",SDL_GetError());
|
||||||
} else {
|
} else {
|
||||||
SDL_RendererInfo ri;
|
SDL_RendererInfo ri;
|
||||||
|
logV("available render drivers:");
|
||||||
for (int i=0; i<numDrivers; i++) {
|
for (int i=0; i<numDrivers; i++) {
|
||||||
int r=SDL_GetRenderDriverInfo(i,&ri);
|
int r=SDL_GetRenderDriverInfo(i,&ri);
|
||||||
if (r!=0) continue;
|
if (r!=0) continue;
|
||||||
availRenderDrivers.push_back(String(ri.name));
|
availRenderDrivers.push_back(String(ri.name));
|
||||||
|
logV("- %s",ri.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6526,6 +6528,7 @@ bool FurnaceGUI::init() {
|
||||||
|
|
||||||
logD("starting render backend...");
|
logD("starting render backend...");
|
||||||
if (!rend->init(sdlWin)) {
|
if (!rend->init(sdlWin)) {
|
||||||
|
logE("it failed...");
|
||||||
if (settings.renderBackend!="SDL") {
|
if (settings.renderBackend!="SDL") {
|
||||||
settings.renderBackend="SDL";
|
settings.renderBackend="SDL";
|
||||||
e->setConf("renderBackend","SDL");
|
e->setConf("renderBackend","SDL");
|
||||||
|
@ -6542,6 +6545,7 @@ bool FurnaceGUI::init() {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
logV("render backend started");
|
||||||
|
|
||||||
// try acquiring the canvas size
|
// try acquiring the canvas size
|
||||||
if (!rend->getOutputSize(canvasW,canvasH)) {
|
if (!rend->getOutputSize(canvasW,canvasH)) {
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
#include "renderSDL.h"
|
#include "renderSDL.h"
|
||||||
#include "backends/imgui_impl_sdlrenderer2.h"
|
#include "backends/imgui_impl_sdlrenderer2.h"
|
||||||
|
#include "../../ta-log.h"
|
||||||
|
|
||||||
class FurnaceSDLTexture: public FurnaceGUITexture {
|
class FurnaceSDLTexture: public FurnaceGUITexture {
|
||||||
public:
|
public:
|
||||||
|
@ -143,7 +144,9 @@ void FurnaceGUIRenderSDL::preInit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FurnaceGUIRenderSDL::init(SDL_Window* win) {
|
bool FurnaceGUIRenderSDL::init(SDL_Window* win) {
|
||||||
|
logV("creating SDL renderer...");
|
||||||
sdlRend=SDL_CreateRenderer(win,-1,SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC|SDL_RENDERER_TARGETTEXTURE);
|
sdlRend=SDL_CreateRenderer(win,-1,SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC|SDL_RENDERER_TARGETTEXTURE);
|
||||||
|
logV("(post creation)");
|
||||||
return (sdlRend!=NULL);
|
return (sdlRend!=NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue