diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-09-19 07:01:26 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-09-19 07:01:26 +0000 |
| commit | be3359bad5930a7aa27237d48aa67e6c7b11975b (patch) | |
| tree | 0eb6a54c7018a3e9503b74fe50ad0ba0a38cddad /src/mesa/drivers/dri/i915/i830_context.h | |
| parent | ffe52c64448a4a3cf10565d3b01591fa9f520c42 (diff) | |
Merge in all the i830 functional differences from the old i830 driver.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i830_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_context.h b/src/mesa/drivers/dri/i915/i830_context.h index 90cc3592df..48eb704cea 100644 --- a/src/mesa/drivers/dri/i915/i830_context.h +++ b/src/mesa/drivers/dri/i915/i830_context.h @@ -169,12 +169,9 @@ i830AllocTexObj( struct gl_texture_object *tObj ); /* i830_texblend.c */ -extern GLuint -i830SetBlend_GL1_2(i830ContextPtr i830, int unit, - GLenum envMode, GLenum format, - GLuint texel_op, - GLuint *state, - const GLfloat *envcolor ); +extern GLuint i830SetTexEnvCombine(i830ContextPtr i830, + const struct gl_tex_env_combine_state * combine, GLint blendUnit, + GLuint texel_op, GLuint *state, const GLfloat *factor ); extern void i830EmitTextureBlend( i830ContextPtr i830 ); |