Fix compiling without opengl. Fix antialiasing flag.

haxenme · Dec 24, 2024 · 260840e · 260840e
1 parent 472bf27
commit 260840e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/project/src/common/ManagedStage.cpp b/project/src/common/ManagedStage.cpp
@@ -41,11 +41,15 @@ ManagedStage::ManagedStage(int inWidth,int inHeight,int inFlags)
    // TODO?
    mHardwareRenderer = HardwareRenderer::CreateMetalNull();
    #else
-   #error "No valid HardwareRenderer"
+   mHardwareRenderer = nullptr;
    #endif
-   mHardwareRenderer->IncRef();
-   mHardwareSurface = new HardwareSurface(mHardwareRenderer);
-   mHardwareSurface->IncRef();
+
+   if (mHardwareRenderer)
+   {
+      mHardwareRenderer->IncRef();
+      mHardwareSurface = new HardwareSurface(mHardwareRenderer);
+      mHardwareSurface->IncRef();
+   }
 }
 
 ManagedStage::~ManagedStage()
@@ -67,7 +71,8 @@ void ManagedStage::SetActiveSize(int inW,int inH)
 {
    mActiveWidth = inW;
    mActiveHeight = inH;
-   mHardwareRenderer->SetWindowSize(inW,inH);
+   if (mHardwareRenderer)
+      mHardwareRenderer->SetWindowSize(inW,inH);
 
    Event event(etResize,inW,inH);
    Stage::HandleEvent(event);

diff --git a/project/src/sdl2/SDL2Stage.cpp b/project/src/sdl2/SDL2Stage.cpp
@@ -425,6 +425,7 @@ class SDLStage : public Stage
       if (mIsFullscreen)
          displayState = sdsFullscreenInteractive;
 
+      #if defined(NME_OGL) || defined(NME_METAL)
       if (mIsHardware)
       {
          if (sgHardwareRenderer)
@@ -469,7 +470,9 @@ class SDLStage : public Stage
             mPrimarySurface = new HardwareSurface(mHardwareRenderer);
       }
       else
+      #endif
       {
+         mIsHardware = false;
          mHardwareRenderer = 0;
          mSoftwareSurface = SDL_CreateRGBSurface(0, mWidth, mHeight, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
          if (!mSoftwareSurface)
@@ -2612,10 +2615,10 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
          break;
       }
 
-      #ifdef NME_SDL3
+      #if defined(NME_SDL3)
       {
          int n = SDL_GetNumRenderDrivers();
-         #if !defined(NME_DYNAMIC_ANGLE)
+         #if !defined(NME_DYNAMIC_ANGLE) && defined(NME_OGL)
          bool useEgl = nmeEglMode;
          #else
          bool useEgl = false;
@@ -2639,7 +2642,9 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
          #endif
          //printf("Using driver: %s, nmeEglMode=%d\n", rname.c_str(), nmeEglMode);
 
+         #ifdef NME_OGL
          InitOGLFunctions();
+         #endif
       }
       #else
       int renderFlags = 0;
@@ -2650,6 +2655,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
       renderer = SDL_CreateRenderer(window, -1, renderFlags);
       #endif
 
+      #ifdef NME_OGL
       if (opengl)
       {
          sgIsOGL2 = (inFlags & (wfAllowShaders | wfRequireShaders));
@@ -2658,6 +2664,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
       {
          sgIsOGL2 = nmeEglMode;
       }
+      #endif
 
       if (!renderer && (inFlags & wfHW_AA_HIRES || inFlags & wfHW_AA))
       {

diff --git a/tools/nme/src/project/NMEProject.hx b/tools/nme/src/project/NMEProject.hx
@@ -1050,6 +1050,7 @@ class NMEProject
       context.WIN_DEPTH_BUFFER = window.depthBuffer;
       context.WIN_STENCIL_BUFFER = window.stencilBuffer;
       context.WIN_ALPHA_BUFFER = window.alphaBuffer;
+      context.WIN_ANTIALIASING = window.antialiasing;
 
       if (certificate != null) 
       {