IL: Refactor texture API

Author: Tiffany Bennett

IntenseLogic

@@ -165,10 +165,10 @@ void Computer::draw(il_mat mvp, il_mat imt)
 {
     ilG_material *mat = ilG_renderman_findMaterial(rm, this->mat);
 
-    ilG_tex_bind(&tex_albedo);
-    ilG_tex_bind(&tex_normal);
-    ilG_tex_bind(&tex_refraction);
-    ilG_tex_bind(&tex_emission);
+    ilG_tex_bind(&tex_albedo, TEX_ALBEDO);
+    ilG_tex_bind(&tex_normal, TEX_NORMAL);
+    ilG_tex_bind(&tex_refraction, TEX_REFRACTION);
+    ilG_tex_bind(&tex_emission, TEX_EMISSION);
 
     ilG_material_bind(mat);
     tgl_vao_bind(&vao);
@@ -184,6 +184,10 @@ void Computer::free()
     glDeleteBuffers(1, &v_vbo);
     glDeleteBuffers(1, &n_vbo);
     glDeleteBuffers(1, &t_vbo);
+    ilG_tex_free(&tex_albedo);
+    ilG_tex_free(&tex_normal);
+    ilG_tex_free(&tex_refraction);
+    ilG_tex_free(&tex_emission);
 }
 
 bool Computer::build(ilG_renderman *rm, char **error)
@@ -249,8 +253,6 @@ bool Computer::build(ilG_renderman *rm, char **error)
             il_error("%s", ilA_img_strerror(err));
             return false;
         }
-        ilG_tex_build(texes[i]);
-        texes[i]->unit = i;
     }
 
     return true;

src/lighting/comp.cpp

@@ -33,12 +33,13 @@ struct Teapot {
     void free() {
         ilG_renderman_delMaterial(rm, mat);
         ilG_mesh_free(&mesh);
+        ilG_tex_free(&tex);
     }
     void draw(il_mat mvp, il_mat imt) {
         ilG_material *mat = ilG_renderman_findMaterial(rm, this->mat);
         ilG_material_bind(mat);
         ilG_mesh_bind(&mesh);
-        ilG_tex_bind(&tex);
+        ilG_tex_bind(&tex, 0);
         ilG_material_bindMatrix(mat, mvp_loc, mvp);
         ilG_material_bindMatrix(mat, imt_loc, imt);
         ilG_mesh_draw(&mesh);
@@ -73,8 +74,6 @@ struct Teapot {
         }
 
         ilG_tex_loadfile(&tex, &demo_fs, "white-marble-texture.png");
-        tex.unit = 0;
-        ilG_tex_build(&tex);
         return true;
     }
 };