fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 15:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv50: some forgotten changes

Browse source
This commit is contained in:
Ben Skeggs 2008-03-12 02:20:40 +11:00
parent ae0e047ba4
commit 1fb3c94f03
3 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/gallium/drivers/nv50/nv50_draw.c
View file

@ -3,53 +3,66 @@
#include "nv50_context.h"
struct nv50_draw_stage {
struct draw_stage draw;
struct nv50_render_stage {
struct draw_stage stage;
struct nv50_context *nv50;
};
static INLINE struct nv50_render_stage *
nv50_render_stage(struct draw_stage *stage)
{
return (struct nv50_render_stage *)stage;
}
static void
nv50_draw_point(struct draw_stage *draw, struct prim_header *prim)
nv50_render_point(struct draw_stage *stage, struct prim_header *prim)
{
NOUVEAU_ERR("\n");
}
static void
nv50_draw_line(struct draw_stage *draw, struct prim_header *prim)
nv50_render_line(struct draw_stage *stage, struct prim_header *prim)
{
NOUVEAU_ERR("\n");
}
static void
nv50_draw_tri(struct draw_stage *draw, struct prim_header *prim)
nv50_render_tri(struct draw_stage *stage, struct prim_header *prim)
{
NOUVEAU_ERR("\n");
}
static void
nv50_draw_flush(struct draw_stage *draw, unsigned flags)
nv50_render_flush(struct draw_stage *stage, unsigned flags)
{
}
static void
nv50_draw_reset_stipple_counter(struct draw_stage *draw)
nv50_render_reset_stipple_counter(struct draw_stage *stage)
{
NOUVEAU_ERR("\n");
}
static void
nv50_render_destroy(struct draw_stage *stage)
{
free(stage);
}
struct draw_stage *
nv50_draw_render_stage(struct nv50_context *nv50)
{
struct nv50_draw_stage *nv50draw = CALLOC_STRUCT(nv50_draw_stage);
struct nv50_render_stage *rs = CALLOC_STRUCT(nv50_render_stage);
nv50draw->nv50 = nv50;
nv50draw->draw.draw = nv50->draw;
nv50draw->draw.point = nv50_draw_point;
nv50draw->draw.line = nv50_draw_line;
nv50draw->draw.tri = nv50_draw_tri;
nv50draw->draw.flush = nv50_draw_flush;
nv50draw->draw.reset_stipple_counter = nv50_draw_reset_stipple_counter;
rs->nv50 = nv50;
rs->stage.draw = nv50->draw;
rs->stage.destroy = nv50_render_destroy;
rs->stage.point = nv50_render_point;
rs->stage.line = nv50_render_line;
rs->stage.tri = nv50_render_tri;
rs->stage.flush = nv50_render_flush;
rs->stage.reset_stipple_counter = nv50_render_reset_stipple_counter;
return &nv50draw->draw;
return &rs->stage;
}

2
src/gallium/drivers/nv50/nv50_screen.c
View file

@ -77,6 +77,8 @@ nv50_screen_get_paramf(struct pipe_screen *pscreen, int param)
return 16.0;
case PIPE_CAP_MAX_TEXTURE_LOD_BIAS:
return 4.0;
case PIPE_CAP_BITMAP_TEXCOORD_BIAS:
return 0.0;
default:
NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
return 0.0;

2
src/gallium/winsys/dri/nouveau/nouveau_context.c
View file

@ -72,7 +72,7 @@ nouveau_channel_context_create(struct nouveau_device *nvdev, unsigned chipset)
return NULL;
}
switch (chipset) {
switch (chipset & 0xf0) {
case 0x50:
case 0x80:
ret = nouveau_surface_channel_create_nv50(nvc);