fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 16:00:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

More code movement, removal of intel dependencies

Browse source
This commit is contained in:
Brian 2007-08-06 12:32:16 -06:00
parent 24ddf1169d
commit bdd3ccf959
4 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.c
View file

@ -32,7 +32,7 @@
#include "pipe/p_context.h"
#define FILE_DEBUG_FLAG DEBUG_MIPTREE
#define DBG if(0) printf
static GLenum
target_to_target(GLenum target)

6
src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.h
View file

@ -28,9 +28,11 @@
#ifndef INTEL_MIPMAP_TREE_H
#define INTEL_MIPMAP_TREE_H
#include "intel_context.h"
#include "main/glheader.h"
#include "main/mtypes.h"
struct pipe_context;
struct pipe_mipmap_tree;
struct pipe_region;

23
src/mesa/drivers/dri/intel/intel_tex_layout.c
View file

@ -32,6 +32,7 @@
#include "macros.h"
#include "pipe/p_state.h"
#include "intel_tex_layout.h"
#include "intel_mipmap_tree.h"
@ -47,7 +48,7 @@ static int align(int value, int alignment)
static void
mipmaptree_set_level_info(struct pipe_mipmap_tree *mt,
intel_miptree_set_level_info(struct pipe_mipmap_tree *mt,
GLuint level,
GLuint nr_images,
GLuint x, GLuint y, GLuint w, GLuint h, GLuint d)
@ -79,6 +80,24 @@ mipmaptree_set_level_info(struct pipe_mipmap_tree *mt,
}
static void
intel_miptree_set_image_offset(struct pipe_mipmap_tree *mt,
GLuint level, GLuint img, GLuint x, GLuint y)
{
if (img == 0 && level == 0)
assert(x == 0 && y == 0);
assert(img < mt->level[level].nr_images);
mt->level[level].image_offset[img] = (x + y * mt->pitch);
/*
DBG("%s level %d img %d pos %d,%d image_offset %x\n",
__FUNCTION__, level, img, x, y, mt->level[level].image_offset[img]);
*/
}
static void
i945_miptree_layout_2d( struct pipe_mipmap_tree *mt )
{
@ -113,7 +132,7 @@ i945_miptree_layout_2d( struct pipe_mipmap_tree *mt )
for ( level = mt->first_level ; level <= mt->last_level ; level++ ) {
GLuint img_height;
mipmaptree_set_level_info(mt, level, 1, x, y, width, height, 1);
intel_miptree_set_level_info(mt, level, 1, x, y, width, height, 1);
if (mt->compressed)
img_height = MAX2(1, height/4);

4
src/mesa/drivers/dri/intel/intel_tex_layout.h
View file

@ -33,6 +33,10 @@
#include "macros.h"
struct pipe_context;
struct pipe_mipmap_tree;
extern void i915_miptree_layout_2d( struct pipe_context *, struct pipe_mipmap_tree *mt );
extern void i945_miptree_layout_2d( struct pipe_context *, struct pipe_mipmap_tree *mt );