#include "pipe/p_state.h"
#include "util/u_memory.h"
#include "util/u_math.h"
+#include "util/u_format.h"
#include "glhd_public.h"
#include "glhd_screen.h"
static float
galahad_screen_get_paramf(struct pipe_screen *_screen,
- enum pipe_cap param)
+ enum pipe_capf param)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
enum pipe_format format,
enum pipe_texture_target target,
unsigned sample_count,
- unsigned tex_usage,
- unsigned geom_flags)
+ unsigned tex_usage)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
format,
target,
sample_count,
- tex_usage,
- geom_flags);
+ tex_usage);
}
static struct pipe_context *
struct pipe_screen *screen = glhd_screen->screen;
struct pipe_resource *result;
- if (templat->target >= PIPE_MAX_TEXTURE_TYPES)
+ glhd_check("%u", templat->width0, >= 1);
+ glhd_check("%u", templat->height0, >= 1);
+ glhd_check("%u", templat->depth0, >= 1);
+ glhd_check("%u", templat->array_size, >= 1);
+
+ if (templat->target == PIPE_BUFFER) {
+ glhd_check("%u", templat->last_level, == 0);
+ glhd_check("%u", templat->height0, == 1);
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, == 1);
+ } else if (templat->target == PIPE_TEXTURE_1D) {
+ unsigned max_texture_2d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_2d_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->height0, == 1);
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, == 1);
+ } else if (templat->target == PIPE_TEXTURE_2D) {
+ unsigned max_texture_2d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_2d_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->height0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, == 1);
+ } else if (templat->target == PIPE_TEXTURE_CUBE) {
+ unsigned max_texture_cube_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_cube_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_cube_levels - 1)));
+ glhd_check("%u", templat->height0, == templat->width0);
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, == 6);
+ } else if (templat->target == PIPE_TEXTURE_RECT) {
+ unsigned max_texture_2d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ glhd_check("%u", templat->last_level, == 0);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->height0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, == 1);
+ } else if (templat->target == PIPE_TEXTURE_3D) {
+ unsigned max_texture_3d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_3D_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_3d_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_3d_levels - 1)));
+ glhd_check("%u", templat->height0, <= (1 << (max_texture_3d_levels - 1)));
+ glhd_check("%u", templat->depth0, <= (1 << (max_texture_3d_levels - 1)));
+ glhd_check("%u", templat->array_size, == 1);
+ } else if (templat->target == PIPE_TEXTURE_1D_ARRAY) {
+ unsigned max_texture_2d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_2d_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->height0, == 1);
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, <= screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS));
+ } else if (templat->target == PIPE_TEXTURE_2D_ARRAY) {
+ unsigned max_texture_2d_levels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ glhd_check("%u", templat->last_level, < max_texture_2d_levels);
+ glhd_check("%u", templat->width0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->height0, <= (1 << (max_texture_2d_levels - 1)));
+ glhd_check("%u", templat->depth0, == 1);
+ glhd_check("%u", templat->array_size, <= screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS));
+ } else {
glhd_warn("Received bogus resource target %d", templat->target);
+ }
if(templat->target != PIPE_TEXTURE_RECT && templat->target != PIPE_BUFFER && !screen->get_param(screen, PIPE_CAP_NPOT_TEXTURES))
{
glhd_warn("Requested NPOT (%ux%u) non-rectangle texture without NPOT support", templat->width0, templat->height0);
}
- if(templat->target == PIPE_TEXTURE_RECT && templat->last_level)
- glhd_warn("Rectangle textures cannot have mipmaps, but last_level = %u", templat->last_level);
-
- if(templat->target == PIPE_BUFFER && templat->last_level)
- glhd_warn("Buffers cannot have mipmaps, but last_level = %u", templat->last_level);
-
- if(templat->target != PIPE_TEXTURE_3D && templat->depth0 != 1)
- glhd_warn("Only 3D textures can have depth != 1, but received target %u and depth %u", templat->target, templat->depth0);
-
- if(templat->target == PIPE_TEXTURE_1D && templat->height0 != 1)
- glhd_warn("1D textures must have height 1 but got asked for height %u", templat->height0);
-
- if(templat->target == PIPE_BUFFER && templat->height0 != 1)
- glhd_warn("Buffers must have height 1 but got asked for height %u", templat->height0);
-
- if(templat->target == PIPE_TEXTURE_CUBE && templat->width0 != templat->height0)
- glhd_warn("Cube maps must be square, but got asked for %ux%u", templat->width0, templat->height0);
+ if (templat->target != PIPE_BUFFER &&
+ !screen->is_format_supported(screen, templat->format, templat->target, templat->nr_samples, templat->bind)) {
+ glhd_warn("Requested format=%s target=%u samples=%u bind=0x%x unsupported",
+ util_format_name(templat->format), templat->target, templat->nr_samples, templat->bind);
+ }
result = screen->resource_create(screen,
templat);
galahad_resource_destroy(galahad_resource(_resource));
}
-static struct pipe_surface *
-galahad_screen_get_tex_surface(struct pipe_screen *_screen,
- struct pipe_resource *_resource,
- unsigned face,
- unsigned level,
- unsigned zslice,
- unsigned usage)
-{
- struct galahad_screen *glhd_screen = galahad_screen(_screen);
- struct galahad_resource *glhd_resource = galahad_resource(_resource);
- struct pipe_screen *screen = glhd_screen->screen;
- struct pipe_resource *resource = glhd_resource->resource;
- struct pipe_surface *result;
-
- result = screen->get_tex_surface(screen,
- resource,
- face,
- level,
- zslice,
- usage);
-
- if (result)
- return galahad_surface_create(glhd_resource, result);
- return NULL;
-}
-
-static void
-galahad_screen_tex_surface_destroy(struct pipe_surface *_surface)
-{
- galahad_surface_destroy(galahad_surface(_surface));
-}
-
-
-
-static struct pipe_resource *
-galahad_screen_user_buffer_create(struct pipe_screen *_screen,
- void *ptr,
- unsigned bytes,
- unsigned usage)
-{
- struct galahad_screen *glhd_screen = galahad_screen(_screen);
- struct pipe_screen *screen = glhd_screen->screen;
- struct pipe_resource *result;
-
- result = screen->user_buffer_create(screen,
- ptr,
- bytes,
- usage);
-
- if (result)
- return galahad_resource_create(glhd_screen, result);
- return NULL;
-}
-
-
static void
galahad_screen_flush_frontbuffer(struct pipe_screen *_screen,
- struct pipe_surface *_surface,
- void *context_private)
+ struct pipe_resource *_resource,
+ unsigned level, unsigned layer,
+ void *context_private,
+ struct pipe_box *sub_box)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
- struct galahad_surface *glhd_surface = galahad_surface(_surface);
+ struct galahad_resource *glhd_resource = galahad_resource(_resource);
struct pipe_screen *screen = glhd_screen->screen;
- struct pipe_surface *surface = glhd_surface->surface;
+ struct pipe_resource *resource = glhd_resource->resource;
screen->flush_frontbuffer(screen,
- surface,
- context_private);
+ resource,
+ level, layer,
+ context_private, sub_box);
}
static void
fence);
}
-static int
+static boolean
galahad_screen_fence_signalled(struct pipe_screen *_screen,
- struct pipe_fence_handle *fence,
- unsigned flags)
+ struct pipe_fence_handle *fence)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->fence_signalled(screen,
- fence,
- flags);
+ fence);
}
-static int
+static boolean
galahad_screen_fence_finish(struct pipe_screen *_screen,
struct pipe_fence_handle *fence,
- unsigned flags)
+ uint64_t timeout)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->fence_finish(screen,
fence,
- flags);
+ timeout);
+}
+
+static uint64_t
+galahad_screen_get_timestamp(struct pipe_screen *_screen)
+{
+ struct galahad_screen *glhd_screen = galahad_screen(_screen);
+ struct pipe_screen *screen = glhd_screen->screen;
+
+ return screen->get_timestamp(screen);
}
struct pipe_screen *
return screen;
}
- glhd_screen->base.winsys = NULL;
-
- glhd_screen->base.destroy = galahad_screen_destroy;
- glhd_screen->base.get_name = galahad_screen_get_name;
- glhd_screen->base.get_vendor = galahad_screen_get_vendor;
- glhd_screen->base.get_param = galahad_screen_get_param;
- glhd_screen->base.get_shader_param = galahad_screen_get_shader_param;
- glhd_screen->base.get_paramf = galahad_screen_get_paramf;
- glhd_screen->base.is_format_supported = galahad_screen_is_format_supported;
- glhd_screen->base.context_create = galahad_screen_context_create;
- glhd_screen->base.resource_create = galahad_screen_resource_create;
- glhd_screen->base.resource_from_handle = galahad_screen_resource_from_handle;
- glhd_screen->base.resource_get_handle = galahad_screen_resource_get_handle;
- glhd_screen->base.resource_destroy = galahad_screen_resource_destroy;
- glhd_screen->base.get_tex_surface = galahad_screen_get_tex_surface;
- glhd_screen->base.tex_surface_destroy = galahad_screen_tex_surface_destroy;
- glhd_screen->base.user_buffer_create = galahad_screen_user_buffer_create;
- glhd_screen->base.flush_frontbuffer = galahad_screen_flush_frontbuffer;
- glhd_screen->base.fence_reference = galahad_screen_fence_reference;
- glhd_screen->base.fence_signalled = galahad_screen_fence_signalled;
- glhd_screen->base.fence_finish = galahad_screen_fence_finish;
+#define GLHD_SCREEN_INIT(_member) \
+ glhd_screen->base . _member = screen -> _member ? galahad_screen_ ## _member : NULL
+
+ GLHD_SCREEN_INIT(destroy);
+ GLHD_SCREEN_INIT(get_name);
+ GLHD_SCREEN_INIT(get_vendor);
+ GLHD_SCREEN_INIT(get_param);
+ GLHD_SCREEN_INIT(get_shader_param);
+ //GLHD_SCREEN_INIT(get_video_param);
+ //GLHD_SCREEN_INIT(get_compute_param);
+ GLHD_SCREEN_INIT(get_paramf);
+ GLHD_SCREEN_INIT(is_format_supported);
+ //GLHD_SCREEN_INIT(is_video_format_supported);
+ GLHD_SCREEN_INIT(context_create);
+ GLHD_SCREEN_INIT(resource_create);
+ GLHD_SCREEN_INIT(resource_from_handle);
+ GLHD_SCREEN_INIT(resource_get_handle);
+ GLHD_SCREEN_INIT(resource_destroy);
+ GLHD_SCREEN_INIT(flush_frontbuffer);
+ GLHD_SCREEN_INIT(fence_reference);
+ GLHD_SCREEN_INIT(fence_signalled);
+ GLHD_SCREEN_INIT(fence_finish);
+ GLHD_SCREEN_INIT(get_timestamp);
+
+#undef GLHD_SCREEN_INIT
glhd_screen->screen = screen;
- glhd_warn("Created screen %p", glhd_screen);
-
return &glhd_screen->base;
}
projects / mesa.git / blobdiff