Revision: 49786
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49786
Author: alexk
Date: 2012-08-10 22:53:48 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Fixes for ES after gpu functions rename
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.c
Modified:
branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.c
2012-08-10 22:51:42 UTC (rev 49785)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_object_gles.c
2012-08-10 22:53:48 UTC (rev 49786)
@@ -69,12 +69,12 @@
void gpu_assign_gles_loc(GPUGLSL_ES_info * glslesinfo, unsigned int program)
{
- glslesinfo->normalmatloc = gpuGetUniformLocation(program,
"b_NormalMatrix");
- glslesinfo->viewmatloc = gpuGetUniformLocation(program,
"b_ModelViewMatrix");
- glslesinfo->projectionmatloc = gpuGetUniformLocation(program,
"b_ProjectionMatrix");
+ glslesinfo->normalmatloc = gpu_glGetUniformLocation(program,
"b_NormalMatrix");
+ glslesinfo->viewmatloc = gpu_glGetUniformLocation(program,
"b_ModelViewMatrix");
+ glslesinfo->projectionmatloc =
gpu_glGetUniformLocation(program, "b_ProjectionMatrix");
- glslesinfo->vertexloc = gpuGetAttribLocation(program,
"b_Vertex");
- glslesinfo->normalloc = gpuGetAttribLocation(program,
"b_Normal");
+ glslesinfo->vertexloc = gpu_glGetAttribLocation(program,
"b_Vertex");
+ glslesinfo->normalloc = gpu_glGetAttribLocation(program,
"b_Normal");
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs