archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OpenGL: clean up use of old extensions

Browse Source
This commit is contained in:
Mike Erwin
2015-11-24 02:20:38 -05:00
parent 4ebede5d1f
commit 291afea8cc
15 changed files with 65 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -3431,7 +3431,7 @@ void DM_draw_attrib_vertex(DMVertexAttribs *attribs, int a, int index, int vert,
if (attribs->orco.gl_texco)
glTexCoord3fv(orco);
else
glVertexAttrib3fvARB(attribs->orco.gl_index, orco);
glVertexAttrib3fv(attribs->orco.gl_index, orco);
}
/* uv texture coordinates */
@@ -3449,7 +3449,7 @@ void DM_draw_attrib_vertex(DMVertexAttribs *attribs, int a, int index, int vert,
if (attribs->tface[b].gl_texco)
glTexCoord2fv(uv);
else
glVertexAttrib2fvARB(attribs->tface[b].gl_index, uv);
glVertexAttrib2fv(attribs->tface[b].gl_index, uv);
}
/* vertex colors */
@@ -3464,14 +3464,14 @@ void DM_draw_attrib_vertex(DMVertexAttribs *attribs, int a, int index, int vert,
col[0] = 0; col[1] = 0; col[2] = 0; col[3] = 0;
}
glVertexAttrib4ubvARB(attribs->mcol[b].gl_index, col);
glVertexAttrib4ubv(attribs->mcol[b].gl_index, col);
}
/* tangent for normal mapping */
if (attribs->tottang) {
/*const*/ float (*array)[4] = attribs->tang.array;
const float *tang = (array) ? array[loop] : zero;
glVertexAttrib4fvARB(attribs->tang.gl_index, tang);
glVertexAttrib4fv(attribs->tang.gl_index, tang);
}
}

8
source/blender/blenkernel/intern/editderivedmesh.c
View File

@@ -1226,7 +1226,7 @@ static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const B
if (attribs->orco.gl_texco)
glTexCoord3fv(orco);
else
glVertexAttrib3fvARB(attribs->orco.gl_index, orco);
glVertexAttrib3fv(attribs->orco.gl_index, orco);
}
for (i = 0; i < attribs->tottface; i++) {
const float *uv;
@@ -1242,7 +1242,7 @@ static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const B
if (attribs->tface[i].gl_texco)
glTexCoord2fv(uv);
else
glVertexAttrib2fvARB(attribs->tface[i].gl_index, uv);
glVertexAttrib2fv(attribs->tface[i].gl_index, uv);
}
for (i = 0; i < attribs->totmcol; i++) {
GLubyte col[4];
@@ -1253,7 +1253,7 @@ static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const B
else {
col[0] = 0; col[1] = 0; col[2] = 0; col[3] = 0;
}
glVertexAttrib4ubvARB(attribs->mcol[i].gl_index, col);
glVertexAttrib4ubv(attribs->mcol[i].gl_index, col);
}
if (attribs->tottang) {
const float *tang;
@@ -1263,7 +1263,7 @@ static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const B
else {
tang = zero;
}
glVertexAttrib4fvARB(attribs->tang.gl_index, tang);
glVertexAttrib4fv(attribs->tang.gl_index, tang);
}
}