diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-04-09 14:52:18 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-04-09 14:53:41 +0200 |
| commit | c96974f78cf3bbb94c01d6c84201595b4028d840 (patch) | |
| tree | 511512f79203e9c4efcc25c9fed620ef6b894404 /src | |
| parent | 6461e91ac3ce6160107d5df7468572c6e943f442 (diff) | |
i915tex: Make sure texture format fetch hooks are initialized.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_tex_image.c | 20 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 4 |
3 files changed, 8 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_image.c b/src/mesa/drivers/dri/i915tex/intel_tex_image.c index 22221e7322..1ce663e994 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_image.c +++ b/src/mesa/drivers/dri/i915tex/intel_tex_image.c @@ -329,25 +329,7 @@ intelTexImage(GLcontext * ctx, texImage->TexFormat = intelChooseTextureFormat(ctx, internalFormat, format, type); - assert(texImage->TexFormat); - - switch (dims) { - case 1: - texImage->FetchTexelc = texImage->TexFormat->FetchTexel1D; - texImage->FetchTexelf = texImage->TexFormat->FetchTexel1Df; - break; - case 2: - texImage->FetchTexelc = texImage->TexFormat->FetchTexel2D; - texImage->FetchTexelf = texImage->TexFormat->FetchTexel2Df; - break; - case 3: - texImage->FetchTexelc = texImage->TexFormat->FetchTexel3D; - texImage->FetchTexelf = texImage->TexFormat->FetchTexel3Df; - break; - default: - assert(0); - break; - } + _mesa_set_fetch_functions(texImage, dims); if (texImage->TexFormat->TexelBytes == 0) { /* must be a compressed format */ diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index a570525155..9b8a06df14 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -2771,8 +2771,8 @@ fetch_texel_chan_to_float(const struct gl_texture_image *texImage, /** * Initialize the texture image's FetchTexelc and FetchTexelf methods. */ -static void -set_fetch_functions(struct gl_texture_image *texImage, GLuint dims) +void +_mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims) { ASSERT(dims == 1 || dims == 2 || dims == 3); ASSERT(texImage->TexFormat); @@ -2832,7 +2832,7 @@ choose_texture_format(GLcontext *ctx, struct gl_texture_image *texImage, ASSERT(texImage->TexFormat); - set_fetch_functions(texImage, dims); + _mesa_set_fetch_functions(texImage, dims); if (texImage->TexFormat->TexelBytes == 0) { /* must be a compressed format */ diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index f67defc503..da0c7cb78e 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -86,6 +86,10 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims, extern void +_mesa_set_fetch_functions(struct gl_texture_image *texImage, GLuint dims); + + +extern void _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint border, |