ilo: define ILO_IMAGE_MAX_LEVEL_COUNT
Define ILO_IMAGE_MAX_LEVEL_COUNT for ilo_image and remove unnecessary header includes.
This commit is contained in:
parent
cbdc26aa3f
commit
7de85694fa
|
@ -29,13 +29,9 @@
|
|||
#define ILO_CORE_H
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
#include "pipe/p_defines.h"
|
||||
|
||||
#include "util/u_debug.h"
|
||||
#include "util/list.h"
|
||||
#include "util/u_inlines.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_pointer.h"
|
||||
|
||||
#endif /* ILO_CORE_H */
|
||||
|
|
|
@ -1029,8 +1029,8 @@ img_calculate_hiz_size(struct ilo_image *img,
|
|||
break;
|
||||
case ILO_IMAGE_WALK_LOD:
|
||||
{
|
||||
unsigned lod_tx[PIPE_MAX_TEXTURE_LEVELS];
|
||||
unsigned lod_ty[PIPE_MAX_TEXTURE_LEVELS];
|
||||
unsigned lod_tx[ILO_IMAGE_MAX_LEVEL_COUNT];
|
||||
unsigned lod_ty[ILO_IMAGE_MAX_LEVEL_COUNT];
|
||||
unsigned cur_tx, cur_ty;
|
||||
|
||||
/* figure out the tile offsets of LODs */
|
||||
|
|
|
@ -33,6 +33,13 @@
|
|||
#include "ilo_core.h"
|
||||
#include "ilo_dev.h"
|
||||
|
||||
/*
|
||||
* From the Ivy Bridge PRM, volume 4 part 1, page 75:
|
||||
*
|
||||
* "(MIP Count / LOD) representing [1,15] MIP levels"
|
||||
*/
|
||||
#define ILO_IMAGE_MAX_LEVEL_COUNT 15
|
||||
|
||||
enum ilo_image_aux_type {
|
||||
ILO_IMAGE_AUX_NONE,
|
||||
ILO_IMAGE_AUX_HIZ,
|
||||
|
@ -154,7 +161,7 @@ struct ilo_image {
|
|||
unsigned align_i;
|
||||
unsigned align_j;
|
||||
|
||||
struct ilo_image_lod lods[PIPE_MAX_TEXTURE_LEVELS];
|
||||
struct ilo_image_lod lods[ILO_IMAGE_MAX_LEVEL_COUNT];
|
||||
|
||||
/* physical layer height for ILO_IMAGE_WALK_LAYER */
|
||||
unsigned walk_layer_height;
|
||||
|
@ -173,7 +180,7 @@ struct ilo_image {
|
|||
unsigned enables;
|
||||
|
||||
/* LOD offsets for ILO_IMAGE_WALK_LOD */
|
||||
unsigned walk_lod_offsets[PIPE_MAX_TEXTURE_LEVELS];
|
||||
unsigned walk_lod_offsets[ILO_IMAGE_MAX_LEVEL_COUNT];
|
||||
|
||||
unsigned walk_layer_height;
|
||||
unsigned bo_stride;
|
||||
|
|
|
@ -29,7 +29,12 @@
|
|||
#define ILO_COMMON_H
|
||||
|
||||
#include "pipe/p_format.h"
|
||||
#include "pipe/p_defines.h"
|
||||
|
||||
#include "util/list.h"
|
||||
#include "util/u_format.h"
|
||||
#include "util/u_inlines.h"
|
||||
#include "util/u_pointer.h"
|
||||
|
||||
#include "core/ilo_core.h"
|
||||
#include "core/ilo_debug.h"
|
||||
|
|
Loading…
Reference in New Issue