Parcourir la source

Do not use standard constants...

Daniele Bartolini il y a 12 ans
Parent
commit
57d4bff53e

+ 1 - 1
engine/renderers/backend/Renderer.h

@@ -632,7 +632,7 @@ public:
 		m_submit->set_vertex_buffer(id);
 	}
 
-	void set_index_buffer(IndexBufferId id, uint32_t start_index = 0, uint32_t num_indices = UINT32_MAX)
+	void set_index_buffer(IndexBufferId id, uint32_t start_index = 0, uint32_t num_indices = 0xFFFFFFFF)
 	{
 		CE_ASSERT(m_index_buffers.has(id), "Index buffer does not exist");
 		m_submit->set_index_buffer(id, start_index, num_indices);

+ 1 - 1
engine/renderers/backend/gl/GLRenderer.cpp

@@ -475,7 +475,7 @@ public:
 				const IndexBuffer& index_buffer = m_index_buffers[ib.index];
 				const uint32_t prim_type = (flags & STATE_PRIMITIVE_MASK) >> STATE_PRIMITIVE_SHIFT;
 				const GLenum gl_prim_type = PRIMITIVE_TYPE_TABLE[prim_type];
-				const uint32_t num_indices = cur_state.num_indices == UINT32_MAX ? index_buffer.m_index_count : cur_state.num_indices;
+				const uint32_t num_indices = cur_state.num_indices == 0xFFFFFFFF ? index_buffer.m_index_count : cur_state.num_indices;
 
 				GL_CHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer.m_id));
 				GL_CHECK(glDrawElements(gl_prim_type, num_indices, GL_UNSIGNED_SHORT, (void*) (uintptr_t) (cur_state.start_index * sizeof(uint16_t))));

+ 1 - 1
engine/renderers/backend/gl/GLRenderer.h

@@ -294,7 +294,7 @@ struct Texture
 	void commit(uint8_t unit, uint32_t flags)
 	{
 		GL_CHECK(glActiveTexture(GL_TEXTURE0 + unit));
-		GL_CHECK(glEnable(m_target));
+		//GL_CHECK(glEnable(m_target));
 		GL_CHECK(glBindTexture(m_target, m_id));
 
 		set_sampler_state(flags);