Bladeren bron

Fixed overrideInternal API.

Branimir Karadžić 6 jaren geleden
bovenliggende
commit
4bc541a723
3 gewijzigde bestanden met toevoegingen van 10 en 3 verwijderingen
  1. 1 1
      include/bgfx/defines.h
  2. 8 1
      include/bgfx/platform.h
  3. 1 1
      src/bgfx.cpp

+ 1 - 1
include/bgfx/defines.h

@@ -6,7 +6,7 @@
 #ifndef BGFX_DEFINES_H_HEADER_GUARD
 #define BGFX_DEFINES_H_HEADER_GUARD
 
-#define BGFX_API_VERSION UINT32_C(97)
+#define BGFX_API_VERSION UINT32_C(98)
 
 /// Color RGB/alpha/depth write. When it's not specified write will be disabled.
 #define BGFX_STATE_WRITE_R                 UINT64_C(0x0000000000000001) //!< Enable R write.

+ 8 - 1
include/bgfx/platform.h

@@ -123,7 +123,14 @@ namespace bgfx
 	///
 	/// @attention C99 equivalent is `bgfx_override_internal_texture`.
 	///
-	uintptr_t overrideInternal(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips, TextureFormat::Enum _format, uint32_t _flags = BGFX_SAMPLER_NONE);
+	uintptr_t overrideInternal(
+		  TextureHandle _handle
+		, uint16_t _width
+		, uint16_t _height
+		, uint8_t _numMips
+		, TextureFormat::Enum _format
+		, uint64_t _flags = BGFX_TEXTURE_NONE|BGFX_SAMPLER_NONE
+		);
 
 } // namespace bgfx
 

+ 1 - 1
src/bgfx.cpp

@@ -360,7 +360,7 @@ namespace bgfx
 		return rci->getInternal(_handle);
 	}
 
-	uintptr_t overrideInternal(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips, TextureFormat::Enum _format, uint32_t _flags)
+	uintptr_t overrideInternal(TextureHandle _handle, uint16_t _width, uint16_t _height, uint8_t _numMips, TextureFormat::Enum _format, uint64_t _flags)
 	{
 		BGFX_CHECK_RENDER_THREAD();
 		RendererContextI* rci = s_ctx->m_renderCtx;