Skip to content
Permalink
Browse files

Replaced uses of PixelFormat in TexBufferPacked for PixelFormatGpu

Ported STBI codec to 2.2 (untested)
Ported PRVTC2 codec to 2.2 (untested)

Deprecated a lot of dead code:
Removed RenderToVertexBuffer
All Texture related classes were moved into the "Deprecated" folder. This is dead code.
Approximately 8 cpp and 8 header files per RenderSystem and in OgreMain were moved to this folder
Users can include the directory "Deprecated" in their include paths in order to avoid compiler errors from
missing #include headers while porting from 2.1 (or if user code supports 2.1 and 2.2 at the same time).
Expect these files _likely_ to be removed for Ogre 2.3
Likewise added OGRE_DEPRECATED_2_2 macro to also include forward declarations in order to increase
compatibility with older codebases
  • Loading branch information...
darksylinc committed Sep 21, 2019
1 parent ff7788d commit 0858387b36388d61f653e71b19e26a955a91ea14
Showing with 730 additions and 2,898 deletions.
  1. +2 −2 Components/Hlms/Common/src/OgreHlmsBufferManager.cpp
  2. +1 −2 Components/Hlms/Pbs/src/OgreHlmsPbs.cpp
  3. +0 −3 Components/Hlms/Pbs/src/OgreHlmsPbsDatablock.cpp
  4. +3 −3 Components/Hlms/Pbs/src/Vct/OgreVctVoxelizer.cpp
  5. +1 −2 Components/Hlms/Unlit/src/OgreHlmsUnlit.cpp
  6. +0 −2 Components/Hlms/Unlit/src/OgreHlmsUnlitDatablock.cpp
  7. +0 −1 Components/Overlay/src/OgreFont.cpp
  8. +8 −8 OgreMain/CMakeLists.txt
  9. +4 −1 OgreMain/include/Compositor/OgreCompositorChannel.h
  10. +7 −6 OgreMain/include/Compositor/OgreCompositorCommon.h
  11. +4 −2 OgreMain/include/Compositor/OgreCompositorManager2.h
  12. +5 −2 OgreMain/include/Compositor/OgreCompositorNodeDef.h
  13. 0 OgreMain/include/{ → Deprecated}/OgreDDSCodec.h
  14. +194 −0 OgreMain/include/Deprecated/OgreDepthBuffer.h
  15. 0 OgreMain/include/{ → Deprecated}/OgreFreeImageCodec.h
  16. 0 OgreMain/include/{ → Deprecated}/OgreHardwarePixelBuffer.h
  17. 0 OgreMain/include/{ → Deprecated}/OgreImage.h
  18. 0 OgreMain/include/{ → Deprecated}/OgreImageCodec.h
  19. 0 OgreMain/include/{ → Deprecated}/OgrePixelBox.h
  20. 0 OgreMain/include/{ → Deprecated}/OgrePixelFormat.h
  21. 0 OgreMain/include/{ → Deprecated}/OgreRenderTarget.h
  22. +2 −2 OgreMain/include/{ → Deprecated}/OgreRenderTargetListener.h
  23. 0 OgreMain/include/{ → Deprecated}/OgreRenderTexture.h
  24. 0 OgreMain/include/{ → Deprecated}/OgreRenderToVertexBuffer.h
  25. 0 OgreMain/include/{ → Deprecated}/OgreRenderWindow.h
  26. 0 OgreMain/include/{ → Deprecated}/OgreTexture.h
  27. 0 OgreMain/include/{ → Deprecated}/OgreTextureManager.h
  28. +0 −6 OgreMain/include/Ogre.h
  29. +0 −2 OgreMain/include/OgreDefaultHardwareBufferManager.h
  30. +4 −95 OgreMain/include/OgreDepthBuffer.h
  31. +0 −12 OgreMain/include/OgreHardwareBufferManager.h
  32. +0 −4 OgreMain/include/OgreHlmsManager.h
  33. +1 −1 OgreMain/include/OgreImage2.h
  34. +2 −2 OgreMain/include/OgrePVRTCCodec.h
  35. +1 −0 OgreMain/include/OgrePixelFormatGpuUtils.h
  36. +20 −12 OgreMain/include/OgrePrerequisites.h
  37. +0 −97 OgreMain/include/OgreRenderSystem.h
  38. +0 −43 OgreMain/include/OgreRoot.h
  39. +3 −3 OgreMain/include/OgreSTBICodec.h
  40. +0 −1 OgreMain/include/OgreTextureUnitState.h
  41. +4 −4 OgreMain/include/Vao/OgreTexBufferPacked.h
  42. +4 −4 OgreMain/include/Vao/OgreUavBufferPacked.h
  43. +2 −3 OgreMain/include/Vao/OgreVaoManager.h
  44. +0 −2 OgreMain/src/Compositor/OgreCompositorManager2.cpp
  45. +0 −2 OgreMain/src/Compositor/OgreCompositorNode.cpp
  46. +0 −3 OgreMain/src/Compositor/OgreCompositorShadowNode.cpp
  47. +0 −3 OgreMain/src/Compositor/OgreCompositorWorkspace.cpp
  48. +0 −3 OgreMain/src/Compositor/OgreTextureDefinition.cpp
  49. +0 −1 OgreMain/src/Compositor/Pass/PassClear/OgreCompositorPassClear.cpp
  50. +0 −3 OgreMain/src/Compositor/Pass/PassCompute/OgreCompositorPassCompute.cpp
  51. +0 −1 OgreMain/src/Compositor/Pass/PassDepthCopy/OgreCompositorPassDepthCopy.cpp
  52. +0 −3 OgreMain/src/Compositor/Pass/PassMipmap/OgreCompositorPassMipmap.cpp
  53. +0 −1 OgreMain/src/Compositor/Pass/PassQuad/OgreCompositorPassQuad.cpp
  54. +0 −4 OgreMain/src/Compositor/Pass/PassScene/OgreCompositorPassScene.cpp
  55. 0 OgreMain/src/{ → Deprecated}/OgreDDSCodec.cpp
  56. +188 −0 OgreMain/src/Deprecated/OgreDepthBuffer.cpp
  57. 0 OgreMain/src/{ → Deprecated}/OgreFreeImageCodec.cpp
  58. 0 OgreMain/src/{ → Deprecated}/OgreHardwarePixelBuffer.cpp
  59. 0 OgreMain/src/{ → Deprecated}/OgreHlmsTextureManager.cpp
  60. 0 OgreMain/{include → src/Deprecated}/OgreHlmsTextureManager.h
  61. 0 OgreMain/src/{ → Deprecated}/OgreImage.cpp
  62. 0 OgreMain/src/{ → Deprecated}/OgrePixelFormat.cpp
  63. 0 OgreMain/src/{ → Deprecated}/OgreRenderTarget.cpp
  64. 0 OgreMain/src/{ → Deprecated}/OgreRenderTexture.cpp
  65. 0 OgreMain/src/{ → Deprecated}/OgreRenderToVertexBuffer.cpp
  66. 0 OgreMain/src/{ → Deprecated}/OgreRenderWindow.cpp
  67. 0 OgreMain/src/{ → Deprecated}/OgreTexture.cpp
  68. 0 OgreMain/src/{ → Deprecated}/OgreTextureManager.cpp
  69. +0 −1 OgreMain/src/OgreASTCCodec.cpp
  70. +0 −2 OgreMain/src/OgreAutoParamDataSource.cpp
  71. +1 −1 OgreMain/src/OgreConstBufferPool.cpp
  72. +0 −8 OgreMain/src/OgreDefaultHardwareBufferManager.cpp
  73. +4 −156 OgreMain/src/OgreDepthBuffer.cpp
  74. +2 −3 OgreMain/src/OgreForward3D.cpp
  75. +2 −3 OgreMain/src/OgreForwardClustered.cpp
  76. +0 −2 OgreMain/src/OgreFreeImageCodec2.cpp
  77. +0 −1 OgreMain/src/OgreGpuProgramParams.cpp
  78. +0 −1 OgreMain/src/OgreHlms.cpp
  79. +0 −1 OgreMain/src/OgreHlmsDatablock.cpp
  80. +0 −1 OgreMain/src/OgreHlmsJsonCompute.cpp
  81. +0 −9 OgreMain/src/OgreHlmsManager.cpp
  82. +2 −3 OgreMain/src/OgreImage2.cpp
  83. +5 −5 OgreMain/src/OgreMaterialSerializer.cpp
  84. +76 −55 OgreMain/src/OgrePVRTCCodec.cpp
  85. +8 −0 OgreMain/src/OgrePixelFormatGpuUtils.cpp
  86. +5 −246 OgreMain/src/OgreRenderSystem.cpp
  87. +0 −59 OgreMain/src/OgreRoot.cpp
  88. +49 −24 OgreMain/src/OgreSTBICodec.cpp
  89. +0 −3 OgreMain/src/OgreSceneManager.cpp
  90. +2 −2 OgreMain/src/OgreScriptTranslator.cpp
  91. +2 −2 OgreMain/src/OgreTextureUnitState.cpp
  92. +0 −1 OgreMain/src/OgreViewport.cpp
  93. +0 −1 OgreMain/src/OgreWindowEventUtilities.cpp
  94. +2 −2 OgreMain/src/Vao/OgreUavBufferPacked.cpp
  95. +1 −1 OgreMain/src/Vao/OgreVaoManager.cpp
  96. +2 −2 PlugIns/ParticleFX/include/OgreColourImageAffector.h
  97. +4 −2 PlugIns/ParticleFX/src/OgreColourImageAffector.cpp
  98. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11DepthBuffer.h
  99. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11DepthTexture.h
  100. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11HardwarePixelBuffer.h
  101. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11MultiRenderTarget.h
  102. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11NullTexture.h
  103. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11RenderToVertexBuffer.h
  104. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11RenderWindow.h
  105. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11Texture.h
  106. 0 RenderSystems/Direct3D11/include/{ → Deprecated}/OgreD3D11TextureManager.h
  107. +0 −2 RenderSystems/Direct3D11/include/OgreD3D11HardwareBufferManager.h
  108. +0 −23 RenderSystems/Direct3D11/include/OgreD3D11Mappings.h
  109. +6 −3 RenderSystems/Direct3D11/include/OgreD3D11Prerequisites.h
  110. +0 −48 RenderSystems/Direct3D11/include/OgreD3D11RenderSystem.h
  111. +1 −1 RenderSystems/Direct3D11/include/Vao/OgreD3D11TexBufferPacked.h
  112. +1 −1 RenderSystems/Direct3D11/include/Vao/OgreD3D11UavBufferPacked.h
  113. +1 −1 RenderSystems/Direct3D11/include/Vao/OgreD3D11VaoManager.h
  114. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11DepthBuffer.cpp
  115. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11DepthTexture.cpp
  116. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11HardwarePixelBuffer.cpp
  117. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11MultiRenderTarget.cpp
  118. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11NullTexture.cpp
  119. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11RenderToVertexBuffer.cpp
  120. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11RenderWindow.cpp
  121. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11Texture.cpp
  122. 0 RenderSystems/Direct3D11/src/{ → Deprecated}/OgreD3D11TextureManager.cpp
  123. +1 −8 RenderSystems/Direct3D11/src/OgreD3D11HardwareBufferManager.cpp
  124. +0 −381 RenderSystems/Direct3D11/src/OgreD3D11Mappings.cpp
  125. +2 −576 RenderSystems/Direct3D11/src/OgreD3D11RenderSystem.cpp
  126. +10 −6 RenderSystems/Direct3D11/src/Vao/OgreD3D11TexBufferPacked.cpp
  127. +1 −1 RenderSystems/Direct3D11/src/Vao/OgreD3D11UavBufferPacked.cpp
  128. +1 −1 RenderSystems/Direct3D11/src/Vao/OgreD3D11VaoManager.cpp
  129. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusDepthBuffer.h
  130. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusDepthTexture.h
  131. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusFBOMultiRenderTarget.h
  132. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusFBORenderTexture.h
  133. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusFrameBufferObject.h
  134. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusHardwarePixelBuffer.h
  135. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusNullTexture.h
  136. +0 −1 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusPixelFormat.h
  137. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusRenderTexture.h
  138. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusRenderToVertexBuffer.h
  139. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusTexture.h
  140. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusTextureBuffer.h
  141. 0 RenderSystems/GL3Plus/include/{ → Deprecated}/OgreGL3PlusTextureManager.h
  142. +0 −2 RenderSystems/GL3Plus/include/OgreGL3PlusDefaultHardwareBufferManager.h
  143. +0 −2 RenderSystems/GL3Plus/include/OgreGL3PlusHardwareBufferManager.h
  144. +1 −0 RenderSystems/GL3Plus/include/OgreGL3PlusMappings.h
  145. +12 −6 RenderSystems/GL3Plus/include/OgreGL3PlusPrerequisites.h
  146. +0 −23 RenderSystems/GL3Plus/include/OgreGL3PlusRenderSystem.h
  147. +0 −1 RenderSystems/GL3Plus/include/OgreGL3PlusSupport.h
  148. +1 −1 RenderSystems/GL3Plus/include/Vao/OgreGL3PlusTexBufferEmulatedPacked.h
  149. +1 −1 RenderSystems/GL3Plus/include/Vao/OgreGL3PlusTexBufferPacked.h
  150. +1 −1 RenderSystems/GL3Plus/include/Vao/OgreGL3PlusUavBufferPacked.h
  151. +1 −1 RenderSystems/GL3Plus/include/Vao/OgreGL3PlusVaoManager.h
  152. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusDepthBuffer.cpp
  153. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusDepthTexture.cpp
  154. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusFBOMultiRenderTarget.cpp
  155. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusFBORenderTexture.cpp
  156. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusFrameBufferObject.cpp
  157. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusHardwarePixelBuffer.cpp
  158. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusNullTexture.cpp
  159. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusPixelFormat.cpp
  160. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusRenderTexture.cpp
  161. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusRenderToVertexBuffer.cpp
  162. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusTexture.cpp
  163. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusTextureBuffer.cpp
  164. 0 RenderSystems/GL3Plus/src/{ → Deprecated}/OgreGL3PlusTextureManager.cpp
  165. +0 −7 RenderSystems/GL3Plus/src/OgreGL3PlusDefaultHardwareBufferManager.cpp
  166. +0 −6 RenderSystems/GL3Plus/src/OgreGL3PlusHardwareBufferManager.cpp
  167. +2 −289 RenderSystems/GL3Plus/src/OgreGL3PlusRenderSystem.cpp
  168. +10 −9 RenderSystems/GL3Plus/src/Vao/OgreGL3PlusTexBufferEmulatedPacked.cpp
  169. +9 −7 RenderSystems/GL3Plus/src/Vao/OgreGL3PlusTexBufferPacked.cpp
  170. +1 −3 RenderSystems/GL3Plus/src/Vao/OgreGL3PlusUavBufferPacked.cpp
  171. +3 −2 RenderSystems/GL3Plus/src/Vao/OgreGL3PlusVaoManager.cpp
  172. +10 −4 RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXGLSupport.cpp
  173. +0 −1 RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXWindow.cpp
  174. +0 −1 RenderSystems/GL3Plus/src/windowing/win32/OgreWin32GLSupport.cpp
  175. +0 −1 RenderSystems/GL3Plus/src/windowing/win32/OgreWin32Window.cpp
  176. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalDepthBuffer.h
  177. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalDepthTexture.h
  178. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalHardwarePixelBuffer.h
  179. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalMultiRenderTarget.h
  180. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalNullTexture.h
  181. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalRenderTexture.h
  182. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalTexture.h
  183. 0 RenderSystems/Metal/include/{ → Deprecated}/OgreMetalTextureManager.h
  184. +0 −2 RenderSystems/Metal/include/OgreMetalHardwareBufferManager.h
  185. +0 −2 RenderSystems/Metal/include/OgreMetalMappings.h
  186. +4 −1 RenderSystems/Metal/include/OgreMetalPrerequisites.h
  187. +0 −8 RenderSystems/Metal/include/OgreMetalRenderSystem.h
  188. +1 −1 RenderSystems/Metal/include/Vao/OgreMetalTexBufferPacked.h
  189. +1 −1 RenderSystems/Metal/include/Vao/OgreMetalUavBufferPacked.h
  190. +1 −1 RenderSystems/Metal/include/Vao/OgreMetalVaoManager.h
  191. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalDepthBuffer.mm
  192. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalDepthTexture.mm
  193. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalHardwarePixelBuffer.mm
  194. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalMultiRenderTarget.mm
  195. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalNullTexture.mm
  196. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalRenderTexture.mm
  197. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalTexture.mm
  198. 0 RenderSystems/Metal/src/{ → Deprecated}/OgreMetalTextureManager.mm
  199. +0 −8 RenderSystems/Metal/src/OgreMetalHardwareBufferManager.mm
  200. +0 −177 RenderSystems/Metal/src/OgreMetalMappings.mm
  201. +2 −207 RenderSystems/Metal/src/OgreMetalRenderSystem.mm
  202. +1 −1 RenderSystems/Metal/src/Vao/OgreMetalTexBufferPacked.mm
  203. +1 −1 RenderSystems/Metal/src/Vao/OgreMetalUavBufferPacked.mm
  204. +1 −1 RenderSystems/Metal/src/Vao/OgreMetalVaoManager.mm
  205. 0 RenderSystems/NULL/include/{ → Deprecated}/OgreNULLHardwarePixelBuffer.h
  206. 0 RenderSystems/NULL/include/{ → Deprecated}/OgreNULLRenderWindow.h
  207. 0 RenderSystems/NULL/include/{ → Deprecated}/OgreNULLTexture.h
  208. 0 RenderSystems/NULL/include/{ → Deprecated}/OgreNULLTextureManager.h
  209. +0 −9 RenderSystems/NULL/include/OgreNULLRenderSystem.h
  210. +1 −1 RenderSystems/NULL/include/Vao/OgreNULLTexBufferPacked.h
  211. +1 −1 RenderSystems/NULL/include/Vao/OgreNULLUavBufferPacked.h
  212. +1 −1 RenderSystems/NULL/include/Vao/OgreNULLVaoManager.h
  213. 0 RenderSystems/NULL/src/{ → Deprecated}/OgreNULLHardwarePixelBuffer.cpp
  214. 0 RenderSystems/NULL/src/{ → Deprecated}/OgreNULLRenderWindow.cpp
  215. 0 RenderSystems/NULL/src/{ → Deprecated}/OgreNULLTextureManager.cpp
  216. +0 −37 RenderSystems/NULL/src/OgreNULLRenderSystem.cpp
  217. +7 −8 RenderSystems/NULL/src/Vao/OgreNULLTexBufferPacked.cpp
  218. +1 −1 RenderSystems/NULL/src/Vao/OgreNULLUavBufferPacked.cpp
  219. +3 −3 RenderSystems/NULL/src/Vao/OgreNULLVaoManager.cpp
  220. +0 −1 Samples/2.0/ApiUsage/AnimationTagPoint/AnimationTagPointGameState.cpp
  221. +0 −1 Samples/2.0/ApiUsage/AreaApproxLights/AreaApproxLightsGameState.cpp
  222. +0 −2 Samples/2.0/ApiUsage/Decals/DecalsGameState.cpp
  223. +0 −1 Samples/2.0/ApiUsage/DynamicGeometry/DynamicGeometryGameState.cpp
  224. +0 −1 ...ApiUsage/ImportAnimationsShareSkeletonInstance/ImportAnimationsShareSkeletonInstanceGameState.cpp
  225. +0 −1 Samples/2.0/ApiUsage/InstancedStereo/InstancedStereoGameState.cpp
  226. +0 −1 Samples/2.0/ApiUsage/InstantRadiosity/InstantRadiosityGameState.cpp
  227. +1 −5 Samples/2.0/ApiUsage/LocalCubemaps/LocalCubemapsGameState.cpp
  228. +0 −2 Samples/2.0/ApiUsage/LocalCubemaps/LocalCubemapsGameState.h
  229. +0 −5 Samples/2.0/ApiUsage/LocalCubemapsManualProbes/LocalCubemapsManualProbesGameState.cpp
  230. +0 −2 Samples/2.0/ApiUsage/LocalCubemapsManualProbes/LocalCubemapsManualProbesGameState.h
  231. +0 −1 Samples/2.0/ApiUsage/PlanarReflections/PlanarReflectionsGameState.cpp
  232. +0 −2 Samples/2.0/ApiUsage/SceneFormat/SceneFormatGameState.cpp
  233. +0 −4 Samples/2.0/ApiUsage/ScreenSpaceReflections/ScreenSpaceReflectionsGameState.cpp
  234. +0 −1 Samples/2.0/ApiUsage/ShadowMapDebugging/ShadowMapDebuggingGameState.cpp
  235. +0 −1 Samples/2.0/ApiUsage/ShadowMapFromCode/ShadowMapFromCodeGameState.cpp
  236. +0 −1 Samples/2.0/ApiUsage/StaticShadowMaps/StaticShadowMapsGameState.cpp
  237. +0 −1 Samples/2.0/ApiUsage/StencilTest/StencilTestGameState.cpp
  238. +0 −1 Samples/2.0/ApiUsage/StereoRendering/StereoRenderingGameState.cpp
  239. +0 −1 Samples/2.0/ApiUsage/UpdatingDecalsAndAreaLightTex/UpdatingDecalsAndAreaLightTexGameState.cpp
  240. +0 −1 Samples/2.0/ApiUsage/V2ManualObject/V2ManualObject.cpp
  241. +0 −1 Samples/2.0/ApiUsage/V2ManualObject/V2ManualObjectGameState.cpp
  242. +0 −1 Samples/2.0/ApiUsage/V2Mesh/V2MeshGameState.cpp
  243. +0 −1 Samples/2.0/Common/src/GraphicsSystem.cpp
  244. +0 −1 Samples/2.0/Common/src/LogicSystem.cpp
  245. +0 −1 Samples/2.0/Showcase/Forward3D/Forward3DGameState.cpp
  246. +0 −1 Samples/2.0/Showcase/Hdr/HdrGameState.cpp
  247. +0 −1 Samples/2.0/Showcase/Postprocessing/Postprocessing.cpp
  248. +0 −1 Samples/2.0/Tests/TextureResidency/TextureResidencyGameState.cpp
  249. +0 −1 Samples/2.0/Tests/Voxelizer/VoxelizerGameState.cpp
  250. +0 −1 Samples/2.0/Tutorials/TutorialSky_Postprocess/TutorialSky_PostprocessGameState.cpp
  251. +0 −1 Samples/2.0/Tutorials/TutorialUav01_Setup/TutorialUav01_SetupGameState.cpp
  252. +0 −1 Samples/2.0/Tutorials/TutorialUav02_Setup/TutorialUav02_SetupGameState.cpp
  253. +0 −1 Samples/2.0/Tutorials/Tutorial_Distortion/Tutorial_DistortionGameState.cpp
  254. +0 −1 Samples/2.0/Tutorials/Tutorial_DynamicCubemap/Tutorial_DynamicCubemap.cpp
  255. +0 −1 Samples/2.0/Tutorials/Tutorial_ReconstructPosFromDepth/Tutorial_ReconstructPosFromDepthGameState.cpp
  256. +0 −1 Samples/2.0/Tutorials/Tutorial_SMAA/Tutorial_SMAAGameState.cpp
  257. +0 −1 Samples/2.0/Tutorials/Tutorial_Terrain/include/Terra/Hlms/OgreHlmsTerraDatablock.h
  258. +0 −1 Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Hlms/OgreHlmsTerra.cpp
  259. +0 −2 Samples/2.0/Tutorials/Tutorial_Terrain/src/Tutorial_Terrain.cpp
  260. +0 −1 Samples/2.0/Tutorials/Tutorial_TextureBaking/Tutorial_TextureBakingGameState.cpp
@@ -88,7 +88,7 @@ namespace Ogre
{
size_t bufferSize = std::min<size_t>( mTextureBufferDefaultSize,
mVaoManager->getTexBufferMaxSize() );
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PF_FLOAT32_RGBA, bufferSize,
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PFG_RGBA32_FLOAT, bufferSize,
BT_DYNAMIC_PERSISTENT, 0, false );
mTexBuffers.push_back( newBuffer );
}
@@ -192,7 +192,7 @@ namespace Ogre
{
size_t bufferSize = std::min<size_t>( mTextureBufferDefaultSize,
mVaoManager->getTexBufferMaxSize() );
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PF_FLOAT32_RGBA, bufferSize,
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PFG_RGBA32_FLOAT, bufferSize,
BT_DYNAMIC_PERSISTENT,
0, false );
mTexBuffers.push_back( newBuffer );
@@ -39,7 +39,6 @@ THE SOFTWARE.
#endif

#include "OgreViewport.h"
#include "OgreRenderTarget.h"
#include "OgreCamera.h"
#include "OgreHighLevelGpuProgramManager.h"
#include "OgreHighLevelGpuProgram.h"
@@ -2302,7 +2301,7 @@ namespace Ogre
{
size_t bufferSize = std::min<size_t>( mTextureBufferDefaultSize,
mVaoManager->getTexBufferMaxSize() );
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PF_FLOAT32_RGBA, bufferSize,
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PFG_RGBA32_FLOAT, bufferSize,
BT_DYNAMIC_PERSISTENT, 0, false );
mTexBuffers.push_back( newBuffer );
}
@@ -31,9 +31,6 @@ THE SOFTWARE.
#include "OgreHlmsPbsDatablock.h"
#include "OgreHlmsPbs.h"
#include "OgreHlmsManager.h"
#include "OgreHlmsTextureManager.h"
#include "OgreTexture.h"
#include "OgreTextureManager.h"
#include "OgreLogManager.h"
#include "OgreTextureGpu.h"
#include "OgreTextureGpuManager.h"
@@ -486,7 +486,7 @@ namespace Ogre
OGRE_ASSERT_LOW( (size_t)(partitionedSubMeshGpuPtrs[3] -
partitionedSubMeshGpuPtrs[2] ) == mNumCompressedPartSubMeshes32 );

mGpuPartitionedSubMeshes = mVaoManager->createTexBuffer( PF_R32G32B32A32_UINT,
mGpuPartitionedSubMeshes = mVaoManager->createTexBuffer( PFG_RGBA32_UINT,
totalNumMeshes *
sizeof(PartitionedSubMesh),
BT_DEFAULT,
@@ -1083,7 +1083,7 @@ namespace Ogre
BB_FLAG_UAV|BB_FLAG_TEX, 0, false );
mCpuInstanceBuffer = reinterpret_cast<float*>( OGRE_MALLOC_SIMD( elementCount * structStride,
MEMCATEGORY_GENERAL ) );
mInstanceBufferAsTex = mInstanceBuffer->getAsTexBufferView( PF_FLOAT32_RGBA );
mInstanceBufferAsTex = mInstanceBuffer->getAsTexBufferView( PFG_RGBA32_FLOAT );
}
}
//-------------------------------------------------------------------------
@@ -1258,7 +1258,7 @@ namespace Ogre
mAabbWorldSpaceJob->_setUavBuffer( 0, bufferSlot );

DescriptorSetTexture2::BufferSlot texBufSlot(DescriptorSetTexture2::BufferSlot::makeEmpty());
texBufSlot.buffer = mMeshAabb->getAsTexBufferView( PF_FLOAT32_RGBA );
texBufSlot.buffer = mMeshAabb->getAsTexBufferView( PFG_RGBA32_FLOAT );
mAabbWorldSpaceJob->setTexBuffer( 0, texBufSlot );

const uint32 threadsPerGroupX = mAabbWorldSpaceJob->getThreadsPerGroupX();
@@ -40,7 +40,6 @@ THE SOFTWARE.
#include "OgreLwString.h"

#include "OgreViewport.h"
#include "OgreRenderTarget.h"
#include "OgreCamera.h"
#include "OgreHighLevelGpuProgramManager.h"
#include "OgreHighLevelGpuProgram.h"
@@ -753,7 +752,7 @@ namespace Ogre
{
size_t bufferSize = std::min<size_t>( mTextureBufferDefaultSize,
mVaoManager->getTexBufferMaxSize() );
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PF_FLOAT32_RGBA, bufferSize,
TexBufferPacked *newBuffer = mVaoManager->createTexBuffer( PFG_RGBA32_FLOAT, bufferSize,
BT_DYNAMIC_PERSISTENT, 0, false );
mTexBuffers.push_back( newBuffer );
}
@@ -31,8 +31,6 @@ THE SOFTWARE.
#include "OgreHlmsUnlitDatablock.h"
#include "OgreHlmsUnlit.h"
#include "OgreHlmsManager.h"
#include "OgreHlmsTextureManager.h"
#include "OgreTexture.h"
#include "OgreTextureGpu.h"
#include "OgreTextureGpuManager.h"
#include "OgreRenderSystem.h"
@@ -39,7 +39,6 @@ THE SOFTWARE

#ifdef OGRE_BUILD_COMPONENT_HLMS_UNLIT
#include "OgreHlmsUnlitDatablock.h"
#include "OgreHardwarePixelBuffer.h"
#else
#include "OgreHlmsUnlitMobileDatablock.h"
#endif
@@ -75,8 +75,8 @@ add_filter_only( "Header Files\\Threading" "${CMAKE_CURRENT_SOURCE_DIR}/include/
add_filter_only( "Source Files\\Threading" "${CMAKE_CURRENT_SOURCE_DIR}/src/Threading/*.cpp" )

# Remove optional header files
list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/OgreFreeImageCodec.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/OgreDDSCodec.h"
list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/OgreFreeImageCodec2.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/OgreDDSCodec2.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/OgrePVRTCCodec.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/OgreETCCodec.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/OgreZip.h"
@@ -85,8 +85,8 @@ list(REMOVE_ITEM HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/OgreFreeImage
)

# Remove optional source files
list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreFreeImageCodec.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/OgreDDSCodec.cpp"
list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreFreeImageCodec2.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/OgreDDSCodec2.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/OgrePVRTCCodec.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/OgreETCCodec.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/OgreZip.cpp"
@@ -333,8 +333,8 @@ if (OGRE_PROFILING_PROVIDER STREQUAL "remotery")
endif ()

if (OGRE_CONFIG_ENABLE_FREEIMAGE)
list(APPEND HEADER_FILES include/OgreFreeImageCodec.h)
list(APPEND SOURCE_FILES src/OgreFreeImageCodec.cpp)
list(APPEND HEADER_FILES include/OgreFreeImageCodec2.h)
list(APPEND SOURCE_FILES src/OgreFreeImageCodec2.cpp)
list(APPEND LIBRARIES "${FreeImage_LIBRARIES}")
endif()

@@ -344,8 +344,8 @@ if (OGRE_CONFIG_ENABLE_STBI)
endif ()

if (OGRE_CONFIG_ENABLE_DDS)
list(APPEND HEADER_FILES include/OgreDDSCodec.h)
list(APPEND SOURCE_FILES src/OgreDDSCodec.cpp)
list(APPEND HEADER_FILES include/OgreDDSCodec2.h)
list(APPEND SOURCE_FILES src/OgreDDSCodec2.cpp)
endif ()

if (OGRE_CONFIG_ENABLE_PVRTC)
@@ -29,9 +29,12 @@ THE SOFTWARE.
#ifndef __CompositorChannel_H__
#define __CompositorChannel_H__

#include "OgreHeaderPrefix.h"
#include "OgrePrerequisites.h"

#include "Compositor/OgreCompositorCommon.h"

#include "OgreHeaderPrefix.h"

namespace Ogre
{
/** \addtogroup Core
@@ -26,10 +26,11 @@ THE SOFTWARE.
-----------------------------------------------------------------------------
*/

#ifndef __CompositorCommon_H__
#define __CompositorCommon_H__
#ifndef _OgreCompositorCommon_H_
#define _OgreCompositorCommon_H_

#include "OgrePixelFormat.h"
#include "OgrePrerequisites.h"
#include "OgreHeaderPrefix.h"

namespace Ogre
{
@@ -39,7 +40,7 @@ namespace Ogre
class CompositorShadowNode;
class CompositorWorkspace;
class CompositorWorkspaceListener;
class RenderTarget;
class TextureGpu;
typedef TextureGpu* CompositorChannel;

class CompositorNodeDef;
@@ -55,8 +56,8 @@ namespace Ogre
typedef vector<CompositorNode*>::type CompositorNodeVec;
typedef vector<CompositorPass*>::type CompositorPassVec;
typedef vector<CompositorShadowNode*>::type CompositorShadowNodeVec;

typedef vector<PixelFormat>::type PixelFormatList;
}

#include "OgreHeaderSuffix.h"

#endif
@@ -29,15 +29,17 @@ THE SOFTWARE.
#ifndef __CompositorManager2_H__
#define __CompositorManager2_H__

#include "OgreHeaderPrefix.h"
#include "OgrePrerequisites.h"

#include "OgreCompositorCommon.h"

#include "OgreIdString.h"
#include "OgreResourceTransition.h"
#include "OgreVector4.h"
#include "OgrePixelFormatGpu.h"
#include "Compositor/OgreCompositorChannel.h"

#include "OgreTexture.h"
#include "OgreHeaderPrefix.h"

namespace Ogre
{
@@ -29,9 +29,12 @@ THE SOFTWARE.
#ifndef __CompositorNodeDef_H__
#define __CompositorNodeDef_H__

#include "OgreHeaderPrefix.h"
#include "Compositor/OgreTextureDefinition.h"
#include "OgrePrerequisites.h"

#include "Compositor/Pass/OgreCompositorPassDef.h"
#include "Compositor/OgreTextureDefinition.h"

#include "OgreHeaderPrefix.h"

namespace Ogre
{
File renamed without changes.

0 comments on commit 0858387

Please sign in to comment.
You can’t perform that action at this time.