projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
cell
/
ppu
/
cell_screen.c
diff --git
a/src/gallium/drivers/cell/ppu/cell_screen.c
b/src/gallium/drivers/cell/ppu/cell_screen.c
index d2235579507beaa58c688252f1c89d2ddb32d32a..d185c6b8497548781a0c845d31335422a853975b 100644
(file)
--- a/
src/gallium/drivers/cell/ppu/cell_screen.c
+++ b/
src/gallium/drivers/cell/ppu/cell_screen.c
@@
-27,7
+27,8
@@
#include "util/u_memory.h"
#include "util/u_memory.h"
-#include "pipe/p_winsys.h"
+#include "util/u_simple_screen.h"
+#include "pipe/internal/p_winsys_screen.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
@@
-40,7
+41,7
@@
static const char *
cell_get_vendor(struct pipe_screen *screen)
{
static const char *
cell_get_vendor(struct pipe_screen *screen)
{
- return "
Tungsten Graphics
, Inc.";
+ return "
VMware
, Inc.";
}
}
@@
-63,8
+64,6
@@
cell_get_param(struct pipe_screen *screen, int param)
return 1;
case PIPE_CAP_GLSL:
return 1;
return 1;
case PIPE_CAP_GLSL:
return 1;
- case PIPE_CAP_S3TC:
- return 0;
case PIPE_CAP_ANISOTROPIC_FILTER:
return 0;
case PIPE_CAP_POINT_SPRITE:
case PIPE_CAP_ANISOTROPIC_FILTER:
return 0;
case PIPE_CAP_POINT_SPRITE:
@@
-81,8
+80,14
@@
cell_get_param(struct pipe_screen *screen, int param)
return 8; /* max 128x128x128 */
case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
return CELL_MAX_TEXTURE_LEVELS;
return 8; /* max 128x128x128 */
case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
return CELL_MAX_TEXTURE_LEVELS;
+ case PIPE_CAP_TEXTURE_MIRROR_REPEAT:
+ return 1; /* XXX not really true */
+ case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
+ return 0; /* XXX to do */
+ case PIPE_CAP_TGSI_CONT_SUPPORTED:
+ return 1;
default:
default:
- return
1
0;
+ return 0;
}
}
}
}
@@
-108,7
+113,7
@@
cell_get_paramf(struct pipe_screen *screen, int param)
return 16.0; /* arbitrary */
default:
return 16.0; /* arbitrary */
default:
- return
1
0;
+ return 0;
}
}
}
}
@@
-165,6
+170,7
@@
cell_create_screen(struct pipe_winsys *winsys)
screen->is_format_supported = cell_is_format_supported;
cell_init_screen_texture_funcs(screen);
screen->is_format_supported = cell_is_format_supported;
cell_init_screen_texture_funcs(screen);
+ u_simple_screen_init(screen);
return screen;
}
return screen;
}