Fix pixel offset issue and add temporary workaround for problem with NPOT textures

2 files changed, 20 insertions, 2 deletions

diff --git a/src/glitz_pixel.c b/src/glitz_pixel.c
index adae8b6..e211e1c 100644
--- a/src/glitz_pixel.c
+++ b/src/glitz_pixel.c
@@ -836,8 +836,9 @@ glitz_set_pixels (glitz_surface_t      *dst,
                 }
                 
                 pixels = ptr +
-                    ((format->skip_lines + box.y1 - y_dst) * bytes_per_line) +
-                    ((format->xoffset + box.x1 - x_dst) * bytes_per_pixel);
+                    (format->skip_lines + y_dst + height - box.y2) *
+                    bytes_per_line +
+                    (format->xoffset + box.x1 - x_dst) * bytes_per_pixel;
             }
 
             gl->tex_sub_image_2d (texture->target, 0,
diff --git a/src/glx/glitz_glx_context.c b/src/glx/glitz_glx_context.c
index b28f149..99a13e2 100644
--- a/src/glx/glitz_glx_context.c
+++ b/src/glx/glitz_glx_context.c
@@ -192,6 +192,8 @@ static void
 _glitz_glx_context_initialize (glitz_glx_screen_info_t *screen_info,
                                glitz_glx_context_t     *context)
 {
+  const char *version;
+    
   glitz_backend_init (&context->backend,
                       glitz_glx_get_proc_address,
                       (void *) screen_info);
@@ -200,6 +202,21 @@ _glitz_glx_context_initialize (glitz_glx_screen_info_t *screen_info,
                                      context->max_viewport_dims);
 
   glitz_initiate_state (&_glitz_glx_gl_proc_address);
+
+  version = context->backend.gl.get_string (GLITZ_GL_VERSION);
+  if (version)
+  {
+    /* Having trouble with TexSubImage2D to NPOT GL_TEXTURE_2D textures when
+       using nvidia's binary driver. Seems like a driver issue, but I'm not
+       sure yet. Turning of NPOT GL_TEXTURE_2D textures until this have been
+       solved. */
+    if (strstr (version, "NVIDIA 61.11") ||
+        strstr (version, "NVIDIA 66.29"))
+    {
+      context->backend.feature_mask &=
+        ~GLITZ_FEATURE_TEXTURE_NON_POWER_OF_TWO_MASK;
+    }
+  }
     
   context->initialized = 1;
 }