intel: Use the gl_format to get the base_format for miptree create.
One less argument to this insanely long function call.
This commit is contained in:
parent
9a523a48af
commit
9c5fdbb721
|
@ -642,7 +642,6 @@ intel_render_texture(struct gl_context * ctx,
|
||||||
|
|
||||||
new_mt = intel_miptree_create(intel, image->TexObject->Target,
|
new_mt = intel_miptree_create(intel, image->TexObject->Target,
|
||||||
intel_image->base.TexFormat,
|
intel_image->base.TexFormat,
|
||||||
intel_image->base._BaseFormat,
|
|
||||||
intel_image->level,
|
intel_image->level,
|
||||||
intel_image->level,
|
intel_image->level,
|
||||||
intel_image->base.Width,
|
intel_image->base.Width,
|
||||||
|
|
|
@ -105,7 +105,6 @@ struct intel_mipmap_tree *
|
||||||
intel_miptree_create(struct intel_context *intel,
|
intel_miptree_create(struct intel_context *intel,
|
||||||
GLenum target,
|
GLenum target,
|
||||||
gl_format format,
|
gl_format format,
|
||||||
GLenum base_format,
|
|
||||||
GLuint first_level,
|
GLuint first_level,
|
||||||
GLuint last_level,
|
GLuint last_level,
|
||||||
GLuint width0,
|
GLuint width0,
|
||||||
|
@ -115,6 +114,7 @@ intel_miptree_create(struct intel_context *intel,
|
||||||
{
|
{
|
||||||
struct intel_mipmap_tree *mt;
|
struct intel_mipmap_tree *mt;
|
||||||
uint32_t tiling = I915_TILING_NONE;
|
uint32_t tiling = I915_TILING_NONE;
|
||||||
|
GLenum base_format = _mesa_get_format_base_format(format);
|
||||||
|
|
||||||
if (intel->use_texture_tiling && compress_byte == 0) {
|
if (intel->use_texture_tiling && compress_byte == 0) {
|
||||||
if (intel->gen >= 4 &&
|
if (intel->gen >= 4 &&
|
||||||
|
|
|
@ -137,7 +137,6 @@ struct intel_mipmap_tree
|
||||||
struct intel_mipmap_tree *intel_miptree_create(struct intel_context *intel,
|
struct intel_mipmap_tree *intel_miptree_create(struct intel_context *intel,
|
||||||
GLenum target,
|
GLenum target,
|
||||||
gl_format format,
|
gl_format format,
|
||||||
GLenum base_format,
|
|
||||||
GLuint first_level,
|
GLuint first_level,
|
||||||
GLuint last_level,
|
GLuint last_level,
|
||||||
GLuint width0,
|
GLuint width0,
|
||||||
|
|
|
@ -116,7 +116,6 @@ intel_miptree_create_for_teximage(struct intel_context *intel,
|
||||||
return intel_miptree_create(intel,
|
return intel_miptree_create(intel,
|
||||||
intelObj->base.Target,
|
intelObj->base.Target,
|
||||||
intelImage->base.TexFormat,
|
intelImage->base.TexFormat,
|
||||||
intelImage->base._BaseFormat,
|
|
||||||
firstLevel,
|
firstLevel,
|
||||||
lastLevel,
|
lastLevel,
|
||||||
width,
|
width,
|
||||||
|
|
|
@ -134,7 +134,6 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
|
||||||
intelObj->mt = intel_miptree_create(intel,
|
intelObj->mt = intel_miptree_create(intel,
|
||||||
intelObj->base.Target,
|
intelObj->base.Target,
|
||||||
firstImage->base.TexFormat,
|
firstImage->base.TexFormat,
|
||||||
firstImage->base._BaseFormat,
|
|
||||||
tObj->BaseLevel,
|
tObj->BaseLevel,
|
||||||
intelObj->_MaxLevel,
|
intelObj->_MaxLevel,
|
||||||
firstImage->base.Width,
|
firstImage->base.Width,
|
||||||
|
|
Loading…
Reference in New Issue