diff options
| author | Keith Whitwell <[email protected]> | 2007-07-31 14:37:45 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2007-07-31 14:37:45 +0100 |
| commit | 9273150f9a8394f4ef630a96f0089ad8cad607f5 (patch) | |
| tree | 6a62bb6a88ebcc0af7682a811ab0c628daadd602 /src/mesa/drivers/dri/i915tex/intel_fbo.h | |
| parent | 9bc1c92a0b809c6b60d5e4a2c8909f5f98528919 (diff) | |
| parent | 7aefdd518578687f961bb512a2b408857f0b9824 (diff) | |
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
Conflicts:
src/mesa/drivers/dri/i915tex/intel_buffers.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_fbo.c
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_fbo.h')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_fbo.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.h b/src/mesa/drivers/dri/i915tex/intel_fbo.h index 86c81060845..7dc39675337 100644 --- a/src/mesa/drivers/dri/i915tex/intel_fbo.h +++ b/src/mesa/drivers/dri/i915tex/intel_fbo.h @@ -91,7 +91,7 @@ struct intel_renderbuffer struct intel_surface *surface; }; - +#if 0 extern struct intel_renderbuffer *intel_create_renderbuffer(GLenum intFormat, GLsizei width, GLsizei height, @@ -99,7 +99,9 @@ extern struct intel_renderbuffer *intel_create_renderbuffer(GLenum intFormat, int pitch, int cpp, void *map); +#endif +extern struct intel_renderbuffer *intel_new_renderbuffer_fb(GLuint intFormat); extern void intel_fbo_init(struct intel_context *intel); |