KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: drop all use of unsigned long 

this changes size on 32/64 bit so is definitely no what you want to use here.
This commit is contained in:
Dave Airlie 2010-10-13 11:08:44 +10:00
parent e9acf9a3bb
commit f8778eeb40
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/r600/r600_resource.h
View File

@ -49,12 +49,12 @@ struct r600_resource {
struct r600_resource_texture {
struct r600_resource resource;
unsigned long offset[PIPE_MAX_TEXTURE_LEVELS];
unsigned long pitch_in_bytes[PIPE_MAX_TEXTURE_LEVELS];
unsigned long pitch_in_pixels[PIPE_MAX_TEXTURE_LEVELS];
unsigned long layer_size[PIPE_MAX_TEXTURE_LEVELS];
unsigned long pitch_override;
unsigned long size;
unsigned offset[PIPE_MAX_TEXTURE_LEVELS];
unsigned pitch_in_bytes[PIPE_MAX_TEXTURE_LEVELS];
unsigned pitch_in_pixels[PIPE_MAX_TEXTURE_LEVELS];
unsigned layer_size[PIPE_MAX_TEXTURE_LEVELS];
unsigned pitch_override;
unsigned size;
unsigned tiled;
unsigned array_mode;
unsigned tile_type;

10
src/gallium/drivers/r600/r600_texture.c
View File

@ -72,11 +72,11 @@ static void r600_copy_into_tiled_texture(struct pipe_context *ctx, struct r600_t
ctx->flush(ctx, 0, NULL);
}
static unsigned long r600_texture_get_offset(struct r600_resource_texture *rtex,
static unsigned r600_texture_get_offset(struct r600_resource_texture *rtex,
unsigned level, unsigned zslice,
unsigned face)
{
unsigned long offset = rtex->offset[level];
unsigned offset = rtex->offset[level];
switch (rtex->resource.base.b.target) {
case PIPE_TEXTURE_3D:
@ -139,7 +139,7 @@ static void r600_setup_miptree(struct pipe_screen *screen,
struct pipe_resource *ptex = &rtex->resource.base.b;
struct radeon *radeon = (struct radeon *)screen->winsys;
enum chip_class chipc = r600_get_family_class(radeon);
unsigned long pitch, size, layer_size, i, offset;
unsigned pitch, size, layer_size, i, offset;
unsigned nblocksy;
for (i = 0, offset = 0; i <= ptex->last_level; i++) {
@ -238,7 +238,7 @@ static struct pipe_surface *r600_get_tex_surface(struct pipe_screen *screen,
{
struct r600_resource_texture *rtex = (struct r600_resource_texture*)texture;
struct pipe_surface *surface = CALLOC_STRUCT(pipe_surface);
unsigned long offset;
unsigned offset;
if (surface == NULL)
return NULL;
@ -427,7 +427,7 @@ void* r600_texture_transfer_map(struct pipe_context *ctx,
struct r600_bo *bo;
enum pipe_format format = transfer->resource->format;
struct radeon *radeon = (struct radeon *)ctx->screen->winsys;
unsigned long offset = 0;
unsigned offset = 0;
char *map;
if (rtransfer->linear_texture) {