Browse Source

Fixed typo.

Branimir Karadžić 9 years ago
parent
commit
1d7b32e464
8 changed files with 15 additions and 15 deletions
  1. 1 1
      src/bgfx.cpp
  2. 3 3
      src/bgfx_p.h
  3. 3 3
      src/config.h
  4. 1 1
      src/renderer_d3d11.h
  5. 1 1
      src/renderer_d3d12.h
  6. 1 1
      src/renderer_d3d9.h
  7. 1 1
      src/renderer_gl.h
  8. 4 4
      src/renderer_mtl.h

+ 1 - 1
src/bgfx.cpp

@@ -2582,7 +2582,7 @@ namespace bgfx
 		g_caps.limits.maxDynamicIndexBuffers  = BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS;
 		g_caps.limits.maxDynamicVertexBuffers = BGFX_CONFIG_MAX_DYNAMIC_VERTEX_BUFFERS;
 		g_caps.limits.maxUniforms             = BGFX_CONFIG_MAX_UNIFORMS;
-		g_caps.limits.maxOcclusionQueries     = BGFX_CONFIG_MAX_OCCUSION_QUERIES;
+		g_caps.limits.maxOcclusionQueries     = BGFX_CONFIG_MAX_OCCLUSION_QUERIES;
 		g_caps.limits.maxFBAttachments        = 1;
 
 		g_caps.vendorId = _vendorId;

+ 3 - 3
src/bgfx_p.h

@@ -1809,7 +1809,7 @@ namespace bgfx
 		Matrix4 m_view[BGFX_CONFIG_MAX_VIEWS];
 		Matrix4 m_proj[2][BGFX_CONFIG_MAX_VIEWS];
 		uint8_t m_viewFlags[BGFX_CONFIG_MAX_VIEWS];
-		uint8_t m_occlusion[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		uint8_t m_occlusion[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 
 		uint64_t m_sortKeys[BGFX_CONFIG_MAX_DRAW_CALLS+1];
 		RenderItemCount m_sortValues[BGFX_CONFIG_MAX_DRAW_CALLS+1];
@@ -3582,7 +3582,7 @@ namespace bgfx
 
 		BGFX_API_FUNC(OcclusionQueryResult::Enum getResult(OcclusionQueryHandle _handle) )
 		{
-			BGFX_CHECK_HANDLE("destroyOcclusionQuery", m_occlusionQueryHandle, _handle);
+			BGFX_CHECK_HANDLE("getResult", m_occlusionQueryHandle, _handle);
 
 			switch (m_submit->m_occlusion[_handle.idx])
 			{
@@ -4114,7 +4114,7 @@ namespace bgfx
 		bx::HandleAllocT<BGFX_CONFIG_MAX_TEXTURES> m_textureHandle;
 		bx::HandleAllocT<BGFX_CONFIG_MAX_FRAME_BUFFERS> m_frameBufferHandle;
 		bx::HandleAllocT<BGFX_CONFIG_MAX_UNIFORMS> m_uniformHandle;
-		bx::HandleAllocT<BGFX_CONFIG_MAX_OCCUSION_QUERIES> m_occlusionQueryHandle;
+		bx::HandleAllocT<BGFX_CONFIG_MAX_OCCLUSION_QUERIES> m_occlusionQueryHandle;
 
 		struct ShaderRef
 		{

+ 3 - 3
src/config.h

@@ -297,9 +297,9 @@
 #	define BGFX_CONFIG_MAX_UNIFORMS 512
 #endif // BGFX_CONFIG_MAX_UNIFORMS
 
-#ifndef BGFX_CONFIG_MAX_OCCUSION_QUERIES
-#	define BGFX_CONFIG_MAX_OCCUSION_QUERIES 256
-#endif // BGFX_CONFIG_MAX_OCCUSION_QUERIES
+#ifndef BGFX_CONFIG_MAX_OCCLUSION_QUERIES
+#	define BGFX_CONFIG_MAX_OCCLUSION_QUERIES 256
+#endif // BGFX_CONFIG_MAX_OCCLUSION_QUERIES
 
 #ifndef BGFX_CONFIG_MAX_COMMAND_BUFFER_SIZE
 #	define BGFX_CONFIG_MAX_COMMAND_BUFFER_SIZE (64<<10)

+ 1 - 1
src/renderer_d3d11.h

@@ -345,7 +345,7 @@ namespace bgfx { namespace d3d11
 			OcclusionQueryHandle m_handle;
 		};
 
-		Query m_query[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		Query m_query[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 		bx::RingBufferControl m_control;
 	};
 

+ 1 - 1
src/renderer_d3d12.h

@@ -484,7 +484,7 @@ namespace bgfx { namespace d3d12
 
 		ID3D12Resource*  m_readback;
 		ID3D12QueryHeap* m_queryHeap;
-		OcclusionQueryHandle m_handle[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		OcclusionQueryHandle m_handle[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 		uint64_t* m_result;
 		bx::RingBufferControl m_control;
 	};

+ 1 - 1
src/renderer_d3d9.h

@@ -475,7 +475,7 @@ namespace bgfx { namespace d3d9
 			OcclusionQueryHandle m_handle;
 		};
 
-		Query m_query[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		Query m_query[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 		bx::RingBufferControl m_control;
 	};
 

+ 1 - 1
src/renderer_gl.h

@@ -1491,7 +1491,7 @@ namespace bgfx { namespace gl
 			OcclusionQueryHandle m_handle;
 		};
 
-		Query m_query[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		Query m_query[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 		bx::RingBufferControl m_control;
 	};
 

+ 4 - 4
src/renderer_mtl.h

@@ -843,7 +843,7 @@ namespace bgfx { namespace mtl
 		CommandQueueMtl() : m_releaseWriteIndex(0), m_releaseReadIndex(0)
 		{
 		}
-		
+
 		void init(Device _device);
 		void shutdown();
 		CommandBuffer alloc();
@@ -856,13 +856,13 @@ namespace bgfx { namespace mtl
 
 		CommandQueue  m_commandQueue;
 		CommandBuffer m_activeCommandBuffer;
-		
+
 		int m_releaseWriteIndex;
 		int m_releaseReadIndex;
 		typedef stl::vector<NSObject*> ResourceArray;
 		ResourceArray m_release[MTL_MAX_FRAMES_IN_FLIGHT];
 	};
-	
+
 	struct TimerQueryMtl
 	{
 		TimerQueryMtl()
@@ -903,7 +903,7 @@ namespace bgfx { namespace mtl
 		};
 
 		Buffer m_buffer;
-		Query m_query[BGFX_CONFIG_MAX_OCCUSION_QUERIES];
+		Query m_query[BGFX_CONFIG_MAX_OCCLUSION_QUERIES];
 		bx::RingBufferControl m_control;
 	};