Skip to content

Commit ba30732

Browse files
committed
Minor additional comments, formatting and fixes.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
1 parent c8deabb commit ba30732

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

src/libutils/oglapphelpers/graphicalapp.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
namespace OCIO_NAMESPACE
1515
{
1616

17+
// Factory for windowed backends (OGL, DX). For headless Vulkan use
18+
// VulkanApp::CreateVulkanApp(). Metal is always paired with OGL (MetalApp
19+
// inherits ScreenOglApp) and is covered by the OCIO_GL_ENABLED branch.
1720
GraphicalAppRcPtr GraphicalApp::CreateApp(const char * winTitle, int winWidth, int winHeight)
1821
{
1922
#ifdef OCIO_GL_ENABLED

src/libutils/oglapphelpers/graphicalapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace OCIO_NAMESPACE
99
{
10-
// Forward declaration of GraphicalApp.
10+
// Forward declaration of GraphicalApp.
1111
class GraphicalApp;
1212
typedef OCIO_SHARED_PTR<GraphicalApp> GraphicalAppRcPtr;
1313

@@ -65,7 +65,7 @@ class GraphicalApp
6565
virtual void readImage(float* imageBuffer) = 0;
6666

6767
// Helper to print graphics info.
68-
void virtual printGraphicsInfo() const noexcept = 0;
68+
virtual void printGraphicsInfo() const noexcept = 0;
6969

7070
// Factory: returns a platform-appropriate GraphicalApp (OGL or DX).
7171
static GraphicalAppRcPtr CreateApp(const char * winTitle, int winWidth, int winHeight);

src/libutils/oglapphelpers/oglapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ void HeadlessOglApp::printEGLInfo() const noexcept
388388

389389
void HeadlessOglApp::redisplay()
390390
{
391-
GraphicalApp::redisplay();
391+
OglApp::redisplay();
392392
eglSwapBuffers(m_eglDisplay, m_eglSurface);
393393
}
394394

tests/gpu/GPUUnitTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ int main(int argc, const char ** argv)
737737
#ifdef OCIO_DIRECTX_ENABLED
738738
if (useDxRenderer)
739739
{
740+
// SM_5_0 controls OCIO shader code generation syntax; DxApp always
741+
// compiles to SM 6.0 via DXC regardless of this enum value.
740742
shadingLanguage = OCIO::GPU_LANGUAGE_HLSL_SM_5_0;
741743
}
742744
else

0 commit comments

Comments
 (0)