From 0d5ad6da0c233e76daf9a5481d2335e7d79bffc2 Mon Sep 17 00:00:00 2001 From: Andre Weissflog Date: Wed, 17 Jun 2015 10:05:19 +0200 Subject: [PATCH] Fixed typos in sample code --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a8d3a35..ab97591 100644 --- a/README.md +++ b/README.md @@ -68,17 +68,17 @@ void glimlSample() { if (ctx.is_3d()) { glTexParameteri(ctx.texture_target(), GL_TEXTURE_WRAP_R, GL_REPEAT); } - glTexParameteri(ctx.texture_target(), GL_MAG_FILTER, GL_LINEAR); - if (ctx.num_mipmaps() > 1) { - glTexParameteri(ctx.texture_target(), GL_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + glTexParameteri(ctx.texture_target(), GL_TEXTURE_MAG_FILTER, GL_LINEAR); + if (ctx.num_mipmaps(0) > 1) { + glTexParameteri(ctx.texture_target(), GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); else { - glTexParameteri(ctx.texture_target(), GL_MIN_FILTER, GL_LINEAR); + glTexParameteri(ctx.texture_target(), GL_TEXTURE_MIN_FILTER, GL_LINEAR); } // for each (cube-map) face... for (int face_index = 0; face_index < ctx.num_faces(); face_index++) { // for each mip-map level - for (int mip_index = 0; mip_index < ctx.num_mipmaps(face); mip_index++) { + for (int mip_index = 0; mip_index < ctx.num_mipmaps(face_index); mip_index++) { if (ctx.is_compressed()) { // compressed if (ctx.is_2d()) { @@ -111,7 +111,7 @@ void glimlSample() { if (ctx.is_2d()) { // 2D or CUBE texture glTexImage2D(ctx.image_target(face_index), - mip, + mip_index, ctx.image_internal_format(), ctx.image_width(face_index, mip_index), ctx.image_height(face_index, mip_index),