diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /src/mesa/swrast/s_depth.h | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'src/mesa/swrast/s_depth.h')
| -rw-r--r-- | src/mesa/swrast/s_depth.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_depth.h b/src/mesa/swrast/s_depth.h index 878d242f5e..e5dae7ef86 100644 --- a/src/mesa/swrast/s_depth.h +++ b/src/mesa/swrast/s_depth.h @@ -32,27 +32,27 @@ extern GLuint -_swrast_depth_test_span( GLcontext *ctx, SWspan *span); +_swrast_depth_test_span( struct gl_context *ctx, SWspan *span); extern void -_swrast_depth_clamp_span( GLcontext *ctx, SWspan *span ); +_swrast_depth_clamp_span( struct gl_context *ctx, SWspan *span ); extern GLboolean -_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span ); +_swrast_depth_bounds_test( struct gl_context *ctx, SWspan *span ); extern void -_swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb, +_swrast_read_depth_span_float( struct gl_context *ctx, struct gl_renderbuffer *rb, GLint n, GLint x, GLint y, GLfloat depth[] ); extern void -_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb, +_swrast_read_depth_span_uint( struct gl_context *ctx, struct gl_renderbuffer *rb, GLint n, GLint x, GLint y, GLuint depth[] ); extern void -_swrast_clear_depth_buffer( GLcontext *ctx, struct gl_renderbuffer *rb ); +_swrast_clear_depth_buffer( struct gl_context *ctx, struct gl_renderbuffer *rb ); #endif |