Switch to explicit GL_CLAMP_TO_EDGE

GL_CLAMP will sample the black edge color whereas GL_CLAMP_TO_EDGE does
not. However, some graphics cards/drivers treat GL_CLAMP like
GL_CLAMP_TO_EDGE. This forces the desired behavior.

diff --git a/src/plugins/elev.c b/src/plugins/elev.c
index 342bc4bde0067eaaadce959df5ad39915024c98c..765e970648c8903bca3725020cf6233d728294a8 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -161,8 +161,8 @@ static guint _load_opengl(GdkPixbuf *pixbuf)
                        (alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
        g_debug("GritsPluginElev: load_opengl %d", opengl);
        return opengl;

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 4f15a946bf5584de49620d105798d11b3da5d222..72fb320e0bd9ae287f59a0eee289489af82a55a2 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -68,8 +68,8 @@ static gboolean _load_tile_cb(gpointer _data)
                        (data->alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, data->pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
        glFlush();
 
        data->tile->data = tex;

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 0d4f0cb26f0f20af02eab00664f54302b40e40c1..c96ecc43b5906f0d0df2cd4f94d9e28dc46edcd9 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -57,8 +57,8 @@ static gboolean _load_tile_cb(gpointer _data)
                        (data->alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, data->pixels);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
        glFlush();
 
        data->tile->data = tex;