summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_sample.c2
-rw-r--r--src/mesa/state_tracker/st_cb_drawpixels.c14
2 files changed, 15 insertions, 1 deletions
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index 3130c5cdae..23a0306bba 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -555,7 +555,7 @@ compute_cache_pos(unsigned face, unsigned level, unsigned zslice,
*
* \param face the cube face in 0..5
* \param level the mipmap level
- * \param zslize which slice of a 3D texture
+ * \param zslice which slice of a 3D texture
* \param x the x coord of texel within 2D image
* \param y the y coord of texel within 2D image
* \param rgba the quad to put the texel/color into
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 7a89e853ee..df0b14463b 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -485,9 +485,23 @@ st_Bitmap(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
}
+static void
+st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
+ GLsizei width, GLsizei height,
+ GLint dstx, GLint dsty, GLenum type)
+{
+ struct st_context *st = ctx->st;
+
+ st_validate_state(st);
+
+ /* XXX to do */
+}
+
+
void st_init_drawpixels_functions(struct dd_function_table *functions)
{
functions->DrawPixels = st_DrawPixels;
+ functions->CopyPixels = st_CopyPixels;
functions->Bitmap = st_Bitmap;
}