Commits

David Rogers committed 2aea1c3

Resolve a few warnings.

  • Participants
  • Parent commits 8000c61

Comments (0)

Files changed (4)

File OgreMain/src/OgreMaterialSerializer.cpp

 				case TextureUnitState::BT_VERTEX:
 					writeValue("vertex");
 					break;
+                case TextureUnitState::BT_GEOMETRY:
+                case TextureUnitState::BT_TESSELATION_DOMAIN:
+                case TextureUnitState::BT_TESSELATION_HULL:
+                case TextureUnitState::BT_COMPUTE:
+                    break;
 				};
 		
 			}

File OgreMain/src/OgreRoot.cpp

     //-----------------------------------------------------------------------
     Root::Root(const String& pluginFileName, const String& configFileName, 
 		const String& logFileName)
-      : mLogManager(0)
+      : mQueuedEnd(false)
+      , mLogManager(0)
 	  , mRenderSystemCapabilitiesManager(0)
 	  , mNextFrame(0)
 	  , mFrameSmoothingTime(0.0f)
 	  , mIsInitialised(false)
 	  , mIsBlendIndicesGpuRedundant(true)
 	  , mIsBlendWeightsGpuRedundant(true)
-	  , mQueuedEnd(false)
     {
         // superclass will do singleton checking
         String msg;

File RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESLinkProgram.cpp

 					case GCT_MATRIX_4X3:
                     case GCT_SAMPLER2DARRAY:
                     case GCT_UNKNOWN:
+                    case GCT_SUBROUTINE:
                         break;
 
 					} // End switch

File RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp

                         case GCT_MATRIX_4X3:
                         case GCT_SAMPLER2DARRAY:
                         case GCT_UNKNOWN:
+                        case GCT_SUBROUTINE:
                             break;
                             
 					} // End switch