mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Luke Benstead 2019-03-25 16:07:27 +00:00
parent ba04f62f6d
commit 493592ea30
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GL/draw.c
View File

@ -1232,14 +1232,16 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
- We want to set the uv coordinates to the passed st ones - We want to set the uv coordinates to the passed st ones
*/ */
if(!doMultitexture) {
/* Multitexture actively disabled */
profiler_pop();
return;
}
TextureObject* texture1 = _glGetTexture1(); TextureObject* texture1 = _glGetTexture1();
/* Multitexture implicitly disabled */ /* Multitexture implicitly disabled */
if(!texture1 || ((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG)) { if(!texture1 || ((ENABLED_VERTEX_ATTRIBUTES & ST_ENABLED_FLAG) != ST_ENABLED_FLAG)) {
doMultitexture = GL_FALSE;
}
if(!doMultitexture) {
/* Multitexture actively disabled */ /* Multitexture actively disabled */
profiler_pop(); profiler_pop();
return; return;
@ -1256,8 +1258,10 @@ static void submitVertices(GLenum mode, GLsizei first, GLuint count, GLenum type
Vertex* mtStart = vertex; Vertex* mtStart = vertex;
/* Replace the UV coordinates with the ST ones */ /* Replace the UV coordinates with the ST ones */
const VertexExtra* end = aligned_vector_back(target->extras) + 1;
VertexExtra* ve = aligned_vector_at(target->extras, 0); VertexExtra* ve = aligned_vector_at(target->extras, 0);
const VertexExtra* end = ve + target->count;
while(ve < end) { while(ve < end) {
vertex->uv[0] = ve->st[0]; vertex->uv[0] = ve->st[0];
vertex->uv[1] = ve->st[1]; vertex->uv[1] = ve->st[1];