Signed-off-by: Abdiel Janulgue <abdiel.janul...@linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 27 ++++++++++++------------
src/mesa/drivers/dri/intel/intel_mipmap_tree.h | 12 +++++++++++
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index a6fa19a..05f5a4d 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -112,17 +112,17 @@ compute_msaa_layout(struct intel_context *intel,
gl_format format)
* intel_miptree_create_for_region(). If true, then do not create
* \c stencil_mt.
*/
-static struct intel_mipmap_tree *
-intel_miptree_create_internal(struct intel_context *intel,
- GLenum target,
- gl_format format,
- GLuint first_level,
- GLuint last_level,
- GLuint width0,
- GLuint height0,
- GLuint depth0,
- bool for_region,
- GLuint num_samples)
+struct intel_mipmap_tree *
+intel_miptree_create_layout(struct intel_context *intel,
+ GLenum target,
+ gl_format format,
+ GLuint first_level,
+ GLuint last_level,
+ GLuint width0,
+ GLuint height0,
+ GLuint depth0,
+ bool for_region,
+ GLuint num_samples)
{
struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1);
int compress_byte = 0;
@@ -365,7 +365,7 @@ intel_miptree_create(struct intel_context *intel,
tiling = I915_TILING_X;
}
- mt = intel_miptree_create_internal(intel, target, format,
+ mt = intel_miptree_create_layout(intel, target, format,
first_level, last_level, width0,
height0, depth0,
false, num_samples);
@@ -408,7 +408,6 @@ intel_miptree_create(struct intel_context *intel,
return mt;
}
-
struct intel_mipmap_tree *
intel_miptree_create_for_region(struct intel_context *intel,
GLenum target,
@@ -417,7 +416,7 @@ intel_miptree_create_for_region(struct intel_context *intel,
{
struct intel_mipmap_tree *mt;
- mt = intel_miptree_create_internal(intel, target, format,
+ mt = intel_miptree_create_layout(intel, target, format,
0, 0,
region->width, region->height, 1,
true, 0 /* num_samples */);
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
index a3f013f..a8f27d9 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
@@ -394,6 +394,18 @@ struct intel_mipmap_tree *intel_miptree_create(struct
intel_context *intel,
bool force_y_tiling);
struct intel_mipmap_tree *
+intel_miptree_create_layout(struct intel_context *intel,
+ GLenum target,
+ gl_format format,
+ GLuint first_level,
+ GLuint last_level,
+ GLuint width0,
+ GLuint height0,
+ GLuint depth0,
+ bool for_region,
+ GLuint num_samples);
+
+struct intel_mipmap_tree *
intel_miptree_create_for_region(struct intel_context *intel,
GLenum target,
gl_format format,
--
1.7.9.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
