diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2015-11-24 10:20:38 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2015-11-24 10:21:07 +0300 |
| commit | 291afea8ccdea57d4b2a51f134e9f53deeff964e (patch) | |
| tree | 9e3b6368fa383b1aef835aa8bdeb7f55671579e1 /source/blender/blenkernel/intern | |
| parent | 4ebede5d1f4db09091df69aa6e19b08b4b0fa535 (diff) | |
OpenGL: clean up use of old extensions
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 0c10a40e432..c705c7adedb 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -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); } } diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 88ae279050c..7fd241eb8e3 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -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); } } |