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

r600g: fix gallium function parameters

This commit is contained in:
Marek Olšák 2010-05-29 15:39:51 +02:00
parent 1d57b6ebd1
commit 7d9396d7cf
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/r600/r600_context.h
View File

@ -82,12 +82,12 @@ struct r600_context {
void r600_draw_arrays(struct pipe_context *ctx, unsigned mode,
unsigned start, unsigned count);
void r600_draw_elements(struct pipe_context *ctx,
struct pipe_buffer *index_buffer,
unsigned index_size, unsigned index_bias, unsigned mode,
struct pipe_resource *index_buffer,
unsigned index_size, int index_bias, unsigned mode,
unsigned start, unsigned count);
void r600_draw_range_elements(struct pipe_context *ctx,
struct pipe_buffer *index_buffer,
unsigned index_size, unsigned index_bias, unsigned min_index,
struct pipe_resource *index_buffer,
unsigned index_size, int index_bias, unsigned min_index,
unsigned max_index, unsigned mode,
unsigned start, unsigned count);

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

@ -43,7 +43,7 @@ struct r600_draw {
unsigned start;
unsigned count;
unsigned index_size;
struct pipe_buffer *index_buffer;
struct pipe_resource *index_buffer;
};
static int r600_draw_common(struct r600_draw *draw)
@ -167,8 +167,8 @@ static int r600_draw_common(struct r600_draw *draw)
}
void r600_draw_range_elements(struct pipe_context *ctx,
struct pipe_buffer *index_buffer,
unsigned index_size, unsigned index_bias, unsigned min_index,
struct pipe_resource *index_buffer,
unsigned index_size, int index_bias, unsigned min_index,
unsigned max_index, unsigned mode,
unsigned start, unsigned count)
{
@ -186,8 +186,8 @@ printf("index_size %d min %d max %d start %d count %d\n", index_size, min_inde
}
void r600_draw_elements(struct pipe_context *ctx,
struct pipe_buffer *index_buffer,
unsigned index_size, unsigned index_bias, unsigned mode,
struct pipe_resource *index_buffer,
unsigned index_size, int index_bias, unsigned mode,
unsigned start, unsigned count)
{
struct r600_draw draw;

7
src/gallium/drivers/r600/r600_screen.c
View File

@ -43,7 +43,7 @@ static const char* r600_get_name(struct pipe_screen* pscreen)
return "R600/R700 (HD2XXX,HD3XXX,HD4XXX)";
}
static int r600_get_param(struct pipe_screen* pscreen, int param)
static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
{
switch (param) {
case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
@ -103,7 +103,7 @@ static int r600_get_param(struct pipe_screen* pscreen, int param)
}
}
static float r600_get_paramf(struct pipe_screen* pscreen, int param)
static float r600_get_paramf(struct pipe_screen* pscreen, enum pipe_cap param)
{
switch (param) {
case PIPE_CAP_MAX_LINE_WIDTH:
@ -124,7 +124,8 @@ static float r600_get_paramf(struct pipe_screen* pscreen, int param)
static boolean r600_is_format_supported(struct pipe_screen* screen,
enum pipe_format format,
enum pipe_texture_target target,
unsigned usage,
unsigned sample_count,
unsigned bindings,
unsigned geom_flags)
{
if (target >= PIPE_MAX_TEXTURE_TYPES) {

3
src/gallium/winsys/r600/drm/r600_drm.c
View File

@ -34,8 +34,7 @@
#include "r600_screen.h"
#include "r600_texture.h"
static struct pipe_screen *r600_drm_create_screen(struct drm_api* api, int drmfd,
struct drm_create_screen_arg *arg)
static struct pipe_screen *r600_drm_create_screen(struct drm_api* api, int drmfd)
{
struct radeon *rw = radeon_new(drmfd, 0);