Fixed a few minor issues with tutorials

TheMostDiligent · TheMostDiligent · commit 341afc2e61d0 · 2022-10-20T19:41:04.000-07:00
diff --git a/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp b/Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp
@@ -252,8 +252,9 @@ class Tutorial00App
         ShaderCreateInfo ShaderCI;
         // Tell the system that the shader source code is in HLSL.
         // For OpenGL, the engine will convert this into GLSL behind the scene
-        ShaderCI.SourceLanguage             = SHADER_SOURCE_LANGUAGE_HLSL;
-        ShaderCI.UseCombinedTextureSamplers = true;
+        ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL;
+        // OpenGL backend requires emulated combined HLSL texture samplers (g_Texture + g_Texture_sampler combination)
+        ShaderCI.Desc.UseCombinedTextureSamplers = true;
         // Create vertex shader
         RefCntAutoPtr<IShader> pVS;
         {
diff --git a/Tutorials/Tutorial21_RayTracing/readme.md b/Tutorials/Tutorial21_RayTracing/readme.md
@@ -46,7 +46,7 @@ instance transformations in the TLAS without the need to rebuild BLASes that rep
 ### Creating Bottom-level Acceleration Structures
 
 There are two types of geometries that a BLAS can contain: triangle geometry or procedural.
-Triangle geomtery is represented by a conventional set of vertices and indices.
+Triangle geometry is represented by a conventional set of vertices and indices.
 Procedural geometry requires an application to define a special type of shader that determines
 how a ray intersects the object. That shader can implement any custom algorithm, but is more 
 expensive than a built-in ray-triangle intersection test.
diff --git a/Tutorials/Tutorial25_StatePackager/CMakeLists.txt b/Tutorials/Tutorial25_StatePackager/CMakeLists.txt
@@ -31,7 +31,8 @@ set(ASSETS ${PSO_ARCHIVE})
 add_sample_app("Tutorial25_StatePackager" "DiligentSamples/Tutorials" "${SOURCE}" "${INCLUDE}" "${SHADERS}" "${ASSETS}")
 
 set(DEVICE_FLAGS --dx11 --dx12)
-if (NOT ${DILIGENT_NO_HLSL})
+# Compute shaders are not supported in OpenGL on MacOS
+if (NOT ${DILIGENT_NO_HLSL} AND NOT PLATFORM_MACOS)
     list(APPEND DEVICE_FLAGS --opengl)
 endif()
 if((NOT ${DILIGENT_NO_GLSLANG}) AND (NOT ${DILIGENT_NO_HLSL}))
