Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GameFoundry/bsf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: REGoth-project/bsf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 6 files changed
  • 1 contributor

Commits on Jul 13, 2019

  1. Fix build 

    Also wraps the makro in do { ... } while(0) to make the compiler
complain about a missing semicolon after a BS_LOG invokation.
    @ataulien
    ataulien committed Jul 13, 2019
    Copy the full SHA
    e176800 View commit details
4 changes: 2 additions & 2 deletions Source/Plugins/bsfGLRenderAPI/Linux/BsLinuxRenderWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -245,7 +245,7 @@ namespace bs
UINT32 outputIdx = mode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

@@ -385,7 +385,7 @@ namespace bs
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

4 changes: 2 additions & 2 deletions Source/Plugins/bsfGLRenderAPI/MacOS/BsMacOSRenderWindow.mm
View file
Original file line number Diff line number Diff line change
@@ -220,7 +220,7 @@
UINT32 outputIdx = videoMode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

@@ -290,7 +290,7 @@
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

4 changes: 2 additions & 2 deletions Source/Plugins/bsfVulkanRenderAPI/Linux/BsLinuxRenderWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -315,7 +315,7 @@ namespace bs
UINT32 outputIdx = mode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

@@ -455,7 +455,7 @@ namespace bs
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

4 changes: 2 additions & 2 deletions Source/Plugins/bsfVulkanRenderAPI/MacOS/BsMacOSRenderWindow.mm
View file
Original file line number Diff line number Diff line change
@@ -227,7 +227,7 @@
UINT32 outputIdx = videoMode.outputIdx;
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

@@ -297,7 +297,7 @@
UINT32 outputIdx = 0; // 0 is always primary
if(outputIdx >= videoModeInfo.getNumOutputs())
{
BS_LOG(Error, Platform, "Invalid output device index.")
BS_LOG(Error, Platform, "Invalid output device index.");
return;
}

2 changes: 1 addition & 1 deletion Source/Scripting/bsfScript/BsScriptExec.cpp
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ int main(int __argc, char* __argv[])
// No assembly to run, or Mono directory not provided
if(__argc < 2)
{
BS_LOG(Error, Script, "No assembly provided")
BS_LOG(Error, Script, "No assembly provided");
return 0;
}

4 changes: 2 additions & 2 deletions Source/Scripting/bsfScript/Extensions/BsRenderTargetEx.cpp
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ namespace bs
depthStencilSurfaceDesc.numFaces = 1;

if (!depthStencilSurface.isLoaded())
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.")
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.");
else
depthStencilSurfaceDesc.texture = depthStencilSurface;
}
@@ -89,7 +89,7 @@ namespace bs
surfaceDesc.numFaces = 1;

if (!colorSurfaces[i].isLoaded())
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.")
BS_LOG(Error, RenderBackend, "Render texture must be created using a fully loaded texture.");
else
surfaceDesc.texture = colorSurfaces[i];