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

galahad: actually remove the driver 

Should have been part of 429a4355259(galahad: remove driver). Seems like
I've erroneously committed the trimmed patch.

Reported-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Emil Velikov 2015-03-21 22:30:52 +00:00
parent bbaf22a998
commit 7c7954b09d
10 changed files with 0 additions and 1998 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/galahad/Makefile.am
View File

@ -1,16 +0,0 @@
################################################################################
# Meta-driver which combines whichever software rasterizers have been
# built into a single convenience library.
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_DRIVER_CFLAGS)
noinst_LTLIBRARIES = libgalahad.la
libgalahad_la_SOURCES = $(C_SOURCES)
EXTRA_DIST = SConscript

8
src/gallium/drivers/galahad/Makefile.sources
View File

@ -1,8 +0,0 @@
C_SOURCES := \
glhd_context.c \
glhd_context.h \
glhd_objects.c \
glhd_objects.h \
glhd_public.h \
glhd_screen.c \
glhd_screen.h

12
src/gallium/drivers/galahad/SConscript
View File

@ -1,12 +0,0 @@
Import('*')
env = env.Clone()
galahad = env.ConvenienceLibrary(
target = 'galahad',
source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
)
env.Alias('galahad', galahad)
Export('galahad')

1056
src/gallium/drivers/galahad/glhd_context.c
View File

File diff suppressed because it is too large Load Diff

69
src/gallium/drivers/galahad/glhd_context.h
View File

@ -1,69 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef GLHD_CONTEXT_H
#define GLHD_CONTEXT_H
#include <stdio.h>
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "util/u_debug.h"
struct galahad_context {
struct pipe_context base; /**< base class */
struct pipe_context *pipe;
};
struct pipe_context *
galahad_context_create(struct pipe_screen *screen, struct pipe_context *pipe);
static INLINE struct galahad_context *
galahad_context(struct pipe_context *pipe)
{
return (struct galahad_context *)pipe;
}
#define glhd_warn(...) \
do { \
debug_printf("galahad: %s: ", __FUNCTION__); \
debug_printf(__VA_ARGS__); \
debug_printf("\n"); \
} while (0)
#define glhd_check(fmt, value, expr) \
((value expr) ? (void)0 : debug_printf("galahad: %s:%u: Expected `%s %s`, got %s == " fmt "\n", __FUNCTION__, __LINE__, #value, #expr, #value, value))
#define glhd_error(...) \
glhd_warn(__VA_ARGS__);
#endif /* GLHD_CONTEXT_H */

186
src/gallium/drivers/galahad/glhd_objects.c
View File

@ -1,186 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "glhd_screen.h"
#include "glhd_objects.h"
#include "glhd_context.h"
struct pipe_resource *
galahad_resource_create(struct galahad_screen *glhd_screen,
struct pipe_resource *resource)
{
struct galahad_resource *glhd_resource;
if(!resource)
goto error;
assert(resource->screen == glhd_screen->screen);
glhd_resource = CALLOC_STRUCT(galahad_resource);
if(!glhd_resource)
goto error;
memcpy(&glhd_resource->base, resource, sizeof(struct pipe_resource));
pipe_reference_init(&glhd_resource->base.reference, 1);
glhd_resource->base.screen = &glhd_screen->base;
glhd_resource->resource = resource;
return &glhd_resource->base;
error:
pipe_resource_reference(&resource, NULL);
return NULL;
}
void
galahad_resource_destroy(struct galahad_resource *glhd_resource)
{
pipe_resource_reference(&glhd_resource->resource, NULL);
FREE(glhd_resource);
}
struct pipe_surface *
galahad_surface_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_surface *surface)
{
struct galahad_surface *glhd_surface;
if(!surface)
goto error;
assert(surface->texture == glhd_resource->resource);
glhd_surface = CALLOC_STRUCT(galahad_surface);
if(!glhd_surface)
goto error;
memcpy(&glhd_surface->base, surface, sizeof(struct pipe_surface));
pipe_reference_init(&glhd_surface->base.reference, 1);
glhd_surface->base.texture = NULL;
pipe_resource_reference(&glhd_surface->base.texture, &glhd_resource->base);
glhd_surface->surface = surface;
return &glhd_surface->base;
error:
pipe_surface_reference(&surface, NULL);
return NULL;
}
void
galahad_surface_destroy(struct galahad_context *glhd_context,
struct galahad_surface *glhd_surface)
{
pipe_resource_reference(&glhd_surface->base.texture, NULL);
pipe_surface_reference(&glhd_surface->surface, NULL);
FREE(glhd_surface);
}
struct pipe_sampler_view *
galahad_sampler_view_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_sampler_view *view)
{
struct galahad_sampler_view *glhd_view;
if (!view)
goto error;
assert(view->texture == glhd_resource->resource);
glhd_view = CALLOC_STRUCT(galahad_sampler_view);
glhd_view->base = *view;
glhd_view->base.reference.count = 1;
glhd_view->base.texture = NULL;
pipe_resource_reference(&glhd_view->base.texture, &glhd_resource->base);
glhd_view->base.context = &glhd_context->base;
glhd_view->sampler_view = view;
return &glhd_view->base;
error:
return NULL;
}
void
galahad_sampler_view_destroy(struct galahad_context *glhd_context,
struct galahad_sampler_view *glhd_view)
{
pipe_sampler_view_reference(&glhd_view->sampler_view, NULL);
pipe_resource_reference(&glhd_view->base.texture, NULL);
FREE(glhd_view);
}
struct pipe_transfer *
galahad_transfer_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_transfer *transfer)
{
struct galahad_transfer *glhd_transfer;
if(!transfer)
goto error;
assert(transfer->resource == glhd_resource->resource);
glhd_transfer = CALLOC_STRUCT(galahad_transfer);
if(!glhd_transfer)
goto error;
memcpy(&glhd_transfer->base, transfer, sizeof(struct pipe_transfer));
glhd_transfer->base.resource = NULL;
glhd_transfer->transfer = transfer;
pipe_resource_reference(&glhd_transfer->base.resource, &glhd_resource->base);
assert(glhd_transfer->base.resource == &glhd_resource->base);
return &glhd_transfer->base;
error:
glhd_context->pipe->transfer_unmap(glhd_context->pipe, transfer);
return NULL;
}
void
galahad_transfer_destroy(struct galahad_context *glhd_context,
struct galahad_transfer *glhd_transfer)
{
pipe_resource_reference(&glhd_transfer->base.resource, NULL);
FREE(glhd_transfer);
}

179
src/gallium/drivers/galahad/glhd_objects.h
View File

@ -1,179 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef GLHD_OBJECTS_H
#define GLHD_OBJECTS_H
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
#include "glhd_screen.h"
struct galahad_context;
struct galahad_resource
{
struct pipe_resource base;
struct pipe_resource *resource;
int map_count;
};
struct galahad_sampler_view
{
struct pipe_sampler_view base;
struct pipe_sampler_view *sampler_view;
};
struct galahad_surface
{
struct pipe_surface base;
struct pipe_surface *surface;
};
struct galahad_transfer
{
struct pipe_transfer base;
struct pipe_transfer *transfer;
};
static INLINE struct galahad_resource *
galahad_resource(struct pipe_resource *_resource)
{
if(!_resource)
return NULL;
(void)galahad_screen(_resource->screen);
return (struct galahad_resource *)_resource;
}
static INLINE struct galahad_sampler_view *
galahad_sampler_view(struct pipe_sampler_view *_sampler_view)
{
if (!_sampler_view) {
return NULL;
}
return (struct galahad_sampler_view *)_sampler_view;
}
static INLINE struct galahad_surface *
galahad_surface(struct pipe_surface *_surface)
{
if(!_surface)
return NULL;
(void)galahad_resource(_surface->texture);
return (struct galahad_surface *)_surface;
}
static INLINE struct galahad_transfer *
galahad_transfer(struct pipe_transfer *_transfer)
{
if(!_transfer)
return NULL;
(void)galahad_resource(_transfer->resource);
return (struct galahad_transfer *)_transfer;
}
static INLINE struct pipe_resource *
galahad_resource_unwrap(struct pipe_resource *_resource)
{
if(!_resource)
return NULL;
return galahad_resource(_resource)->resource;
}
static INLINE struct pipe_sampler_view *
galahad_sampler_view_unwrap(struct pipe_sampler_view *_sampler_view)
{
if (!_sampler_view) {
return NULL;
}
return galahad_sampler_view(_sampler_view)->sampler_view;
}
static INLINE struct pipe_surface *
galahad_surface_unwrap(struct pipe_surface *_surface)
{
if(!_surface)
return NULL;
return galahad_surface(_surface)->surface;
}
static INLINE struct pipe_transfer *
galahad_transfer_unwrap(struct pipe_transfer *_transfer)
{
if(!_transfer)
return NULL;
return galahad_transfer(_transfer)->transfer;
}
struct pipe_resource *
galahad_resource_create(struct galahad_screen *glhd_screen,
struct pipe_resource *resource);
void
galahad_resource_destroy(struct galahad_resource *glhd_resource);
struct pipe_surface *
galahad_surface_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_surface *surface);
void
galahad_surface_destroy(struct galahad_context *glhd_context,
struct galahad_surface *glhd_surface);
struct pipe_sampler_view *
galahad_sampler_view_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_sampler_view *view);
void
galahad_sampler_view_destroy(struct galahad_context *glhd_context,
struct galahad_sampler_view *glhd_sampler_view);
struct pipe_transfer *
galahad_transfer_create(struct galahad_context *glhd_context,
struct galahad_resource *glhd_resource,
struct pipe_transfer *transfer);
void
galahad_transfer_destroy(struct galahad_context *glhd_context,
struct galahad_transfer *glhd_transfer);
#endif /* GLHD_OBJECTS_H */

37
src/gallium/drivers/galahad/glhd_public.h
View File

@ -1,37 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef GLHD_PUBLIC_H
#define GLHD_PUBLIC_H
struct pipe_screen;
struct pipe_context;
struct pipe_screen *
galahad_screen_create(struct pipe_screen *screen);
#endif /* GLHD_PUBLIC_H */

387
src/gallium/drivers/galahad/glhd_screen.c
View File

@ -1,387 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* 2010 Corbin Simpson <MostAwesomeDude@gmail.com>
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include "pipe/p_screen.h"
#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"
#include "glhd_context.h"
#include "glhd_objects.h"
DEBUG_GET_ONCE_BOOL_OPTION(galahad, "GALLIUM_GALAHAD", FALSE)
static void
galahad_screen_destroy(struct pipe_screen *_screen)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
screen->destroy(screen);
FREE(glhd_screen);
}
static const char *
galahad_screen_get_name(struct pipe_screen *_screen)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->get_name(screen);
}
static const char *
galahad_screen_get_vendor(struct pipe_screen *_screen)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->get_vendor(screen);
}
static int
galahad_screen_get_param(struct pipe_screen *_screen,
enum pipe_cap param)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->get_param(screen,
param);
}
static int
galahad_screen_get_shader_param(struct pipe_screen *_screen,
unsigned shader, enum pipe_shader_cap param)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->get_shader_param(screen, shader,
param);
}
static float
galahad_screen_get_paramf(struct pipe_screen *_screen,
enum pipe_capf param)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->get_paramf(screen,
param);
}
static boolean
galahad_screen_is_format_supported(struct pipe_screen *_screen,
enum pipe_format format,
enum pipe_texture_target target,
unsigned sample_count,
unsigned tex_usage)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
if (target >= PIPE_MAX_TEXTURE_TYPES) {
glhd_warn("Received bogus texture target %d", target);
}
return screen->is_format_supported(screen,
format,
target,
sample_count,
tex_usage);
}
static struct pipe_context *
galahad_screen_context_create(struct pipe_screen *_screen,
void *priv)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
struct pipe_context *result;
result = screen->context_create(screen, priv);
if (result)
return galahad_context_create(_screen, result);
return NULL;
}
static struct pipe_resource *
galahad_screen_resource_create(struct pipe_screen *_screen,
const struct pipe_resource *templat)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
struct pipe_resource *result;
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_CUBE_ARRAY) {
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 == 0);
} 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))
{
if(!util_is_power_of_two(templat->width0) || !util_is_power_of_two(templat->height0))
glhd_warn("Requested NPOT (%ux%u) non-rectangle texture without NPOT support", 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);
if (result)
return galahad_resource_create(glhd_screen, result);
return NULL;
}
static struct pipe_resource *
galahad_screen_resource_from_handle(struct pipe_screen *_screen,
const struct pipe_resource *templ,
struct winsys_handle *handle)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
struct pipe_resource *result;
/* TODO trace call */
result = screen->resource_from_handle(screen, templ, handle);
result = galahad_resource_create(galahad_screen(_screen), result);
return result;
}
static boolean
galahad_screen_resource_get_handle(struct pipe_screen *_screen,
struct pipe_resource *_resource,
struct winsys_handle *handle)
{
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;
/* TODO trace call */
return screen->resource_get_handle(screen, resource, handle);
}
static void
galahad_screen_resource_destroy(struct pipe_screen *screen,
struct pipe_resource *_resource)
{
galahad_resource_destroy(galahad_resource(_resource));
}
static void
galahad_screen_flush_frontbuffer(struct pipe_screen *_screen,
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_resource *glhd_resource = galahad_resource(_resource);
struct pipe_screen *screen = glhd_screen->screen;
struct pipe_resource *resource = glhd_resource->resource;
screen->flush_frontbuffer(screen,
resource,
level, layer,
context_private, sub_box);
}
static void
galahad_screen_fence_reference(struct pipe_screen *_screen,
struct pipe_fence_handle **ptr,
struct pipe_fence_handle *fence)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
screen->fence_reference(screen,
ptr,
fence);
}
static boolean
galahad_screen_fence_signalled(struct pipe_screen *_screen,
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);
}
static boolean
galahad_screen_fence_finish(struct pipe_screen *_screen,
struct pipe_fence_handle *fence,
uint64_t timeout)
{
struct galahad_screen *glhd_screen = galahad_screen(_screen);
struct pipe_screen *screen = glhd_screen->screen;
return screen->fence_finish(screen,
fence,
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 *
galahad_screen_create(struct pipe_screen *screen)
{
struct galahad_screen *glhd_screen;
if (!debug_get_option_galahad())
return screen;
glhd_screen = CALLOC_STRUCT(galahad_screen);
if (!glhd_screen) {
return screen;
}
#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;
return &glhd_screen->base;
}

48
src/gallium/drivers/galahad/glhd_screen.h
View File

@ -1,48 +0,0 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#ifndef GLHD_SCREEN_H
#define GLHD_SCREEN_H
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
struct galahad_screen {
struct pipe_screen base;
struct pipe_screen *screen;
};
static INLINE struct galahad_screen *
galahad_screen(struct pipe_screen *screen)
{
return (struct galahad_screen *)screen;
}
#endif /* GLHD_SCREEN_H */