OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/failover: Remove the deprecated module.

Browse Source 
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Kai Wasserbäch
2011-11-29 22:36:02 +01:00
committed by José Fonseca
parent 15245cbad4
commit 0a22fb6a5d
15 changed files with 12 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/darwin
View File

@@ -54,5 +54,5 @@ GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri
DRI_DIRS = swrast
GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover
GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad
#GALLIUM_DRIVERS_DIRS += llvmpipe

4
configs/default
View File

@@ -116,10 +116,10 @@ EGL_DRIVERS_DIRS = glx
# gbm backends to build
GBM_BACKEND_DIRS = dri
# Gallium directories and
# Gallium directories and
GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50 failover
GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = sw sw/xlib
GALLIUM_TARGET_DIRS = libgl-xlib

2
configure.ac
View File

@@ -799,7 +799,7 @@ GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
GALLIUM_WINSYS_DIRS="sw"
GALLIUM_DRIVERS_DIRS="failover galahad trace rbug noop identity"
GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity"
GALLIUM_STATE_TRACKERS_DIRS=""
# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled

7
docs/relnotes-7.12.html
View File

@@ -72,10 +72,9 @@ tbd
<li>Removed support for GL_APPLE_client_storage extension.</li>
<li>Removed the classic Mesa r300 and r600 drivers, which are superseded
by the gallium drivers for this hardware.</li>
<li>Removed the i965g driver, which was broken and with nobody in sight to fix
the situation</li>
<li>Removed the Gallium cell driver, it was just a burden on Gallium
development and nobody seems to use it.</li>
<li>Removed the dead Gallium i965, cell and failover drivers, which were
either broken and with nobody in sight to fix the situation or
deprecated.</li>
</ul>

12
doxygen/gallium.doc
View File

@@ -34,7 +34,6 @@
- Pipe drivers:
- \ref softpipe
- \ref i915g
- \ref failover
- Winsys drivers:
- X11 winsys driver (xm_winsys.c)
@@ -129,17 +128,6 @@
\sa i915_winsys.h
*/
/** \page failover Failover Module
The failover module acts as a selector between a hardware driver and the
softpipe driver. When the hardware can't implement a particular rendering
operation, the failover module will pass the request to the softpipe driver.
This is a different solution to the "software fallbacks" scheme of previous
Mesa drivers.
\sa fo_winsys.h
*/
/** \page draw Draw Module
The Draw module provides point/line/polygon rendering services such as
vertex transformation, polygon culling and clipping. It will be used by

11
src/gallium/SConscript
View File

@@ -11,20 +11,19 @@ SConscript('auxiliary/SConscript')
#
SConscript([
'drivers/failover/SConscript',
'drivers/galahad/SConscript',
'drivers/identity/SConscript',
'drivers/llvmpipe/SConscript',
'drivers/identity/SConscript',
'drivers/llvmpipe/SConscript',
'drivers/rbug/SConscript',
'drivers/softpipe/SConscript',
'drivers/svga/SConscript',
'drivers/trace/SConscript',
'drivers/svga/SConscript',
'drivers/trace/SConscript',
])
if not env['msvc']:
# These drivers do not build on MSVC compilers
SConscript([
'drivers/i915/SConscript',
'drivers/i915/SConscript',
'drivers/r300/SConscript',
])

11
src/gallium/docs/source/distro.rst
View File

@@ -7,17 +7,6 @@ and auxiliary modules are shipped in the standard Gallium distribution.
Drivers
-------
Cell
^^^^
Simple driver for the IBM Cell architecture. Runs faster than :ref:`softpipe`
on Cell-based machines.
Failover
^^^^^^^^
Broken and deprecated.
Intel i915
^^^^^^^^^^

11
src/gallium/drivers/failover/Makefile
View File

@@ -1,11 +0,0 @@
TOP = ../../../..
include $(TOP)/configs/current
LIBNAME = failover
C_SOURCES = \
fo_state.c \
fo_state_emit.c \
fo_context.c
include ../../Makefile.template

15
src/gallium/drivers/failover/SConscript
View File

@@ -1,15 +0,0 @@
Import('*')
env = env.Clone()
failover = env.ConvenienceLibrary(
target = 'failover',
source = [
'fo_state.c',
'fo_state_emit.c',
'fo_context.c',
])
env.Alias('failover', failover)
Export('failover')

146
src/gallium/drivers/failover/fo_context.c
View File

@@ -1,146 +0,0 @@
/**************************************************************************
*
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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 TUNGSTEN GRAPHICS 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_defines.h"
#include "util/u_memory.h"
#include "pipe/p_context.h"
#include "util/u_inlines.h"
#include "fo_context.h"
#include "fo_winsys.h"
static void failover_destroy( struct pipe_context *pipe )
{
struct failover_context *failover = failover_context( pipe );
unsigned i;
for (i = 0; i < failover->num_vertex_buffers; i++) {
pipe_resource_reference(&failover->vertex_buffers[i].buffer, NULL);
}
FREE( failover );
}
void failover_fail_over( struct failover_context *failover )
{
failover->dirty = TRUE;
failover->mode = FO_SW;
}
static void failover_draw_vbo( struct pipe_context *pipe,
const struct pipe_draw_info *info)
{
struct failover_context *failover = failover_context( pipe );
/* If there has been any statechange since last time, try hardware
* rendering again:
*/
if (failover->dirty) {
failover->mode = FO_HW;
}
/* Try hardware:
*/
if (failover->mode == FO_HW) {
failover->hw->draw_vbo( failover->hw, info );
}
/* Possibly try software:
*/
if (failover->mode == FO_SW) {
if (failover->dirty) {
failover->hw->flush( failover->hw, NULL );
failover_state_emit( failover );
}
failover->sw->draw_vbo( failover->sw, info );
/* Be ready to switch back to hardware rendering without an
* intervening flush. Unlikely to be much performance impact to
* this:
*/
failover->sw->flush( failover->sw, NULL );
}
}
struct pipe_context *failover_create( struct pipe_context *hw,
struct pipe_context *sw )
{
struct failover_context *failover = CALLOC_STRUCT(failover_context);
if (failover == NULL)
return NULL;
failover->hw = hw;
failover->sw = sw;
failover->pipe.winsys = hw->winsys;
failover->pipe.screen = hw->screen;
failover->pipe.destroy = failover_destroy;
#if 0
failover->pipe.is_format_supported = hw->is_format_supported;
failover->pipe.get_name = hw->get_name;
failover->pipe.get_vendor = hw->get_vendor;
failover->pipe.get_param = hw->get_param;
failover->pipe.get_shader_param = hw->get_shader_param;
failover->pipe.get_paramf = hw->get_paramf;
#endif
failover->pipe.draw_vbo = failover_draw_vbo;
failover->pipe.clear = hw->clear;
failover->pipe.clear_render_target = hw->clear_render_target;
failover->pipe.clear_depth_stencil = hw->clear_depth_stencil;
/* No software occlusion fallback (or other optional functionality)
* at this point - if the hardware doesn't support it, don't
* advertise it to the application.
*/
failover->pipe.begin_query = hw->begin_query;
failover->pipe.end_query = hw->end_query;
failover_init_state_functions( failover );
failover->pipe.resource_copy_region = hw->resource_copy_region;
#if 0
failover->pipe.resource_create = hw->resource_create;
failover->pipe.resource_destroy = hw->resource_destroy;
failover->pipe.create_surface = hw->create_surface;
failover->pipe.surface_destroy = hw->surface_destroy;
#endif
failover->pipe.flush = hw->flush;
failover->dirty = 0;
return &failover->pipe;
}

144
src/gallium/drivers/failover/fo_context.h
View File

@@ -1,144 +0,0 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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 TUNGSTEN GRAPHICS 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.
*
**************************************************************************/
/* Authors: Keith Whitwell <keith@tungstengraphics.com>
*/
#ifndef FO_CONTEXT_H
#define FO_CONTEXT_H
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#define FO_NEW_VIEWPORT 0x1
#define FO_NEW_RASTERIZER 0x2
#define FO_NEW_FRAGMENT_SHADER 0x4
#define FO_NEW_BLEND 0x8
#define FO_NEW_CLIP 0x10
#define FO_NEW_SCISSOR 0x20
#define FO_NEW_STIPPLE 0x40
#define FO_NEW_FRAMEBUFFER 0x80
#define FO_NEW_ALPHA_TEST 0x100
#define FO_NEW_DEPTH_STENCIL 0x200
#define FO_NEW_SAMPLER 0x400
#define FO_NEW_SAMPLER_VIEW 0x800
#define FO_NEW_VERTEX 0x2000
#define FO_NEW_VERTEX_SHADER 0x4000
#define FO_NEW_BLEND_COLOR 0x8000
#define FO_NEW_STENCIL_REF 0x10000
#define FO_NEW_CLEAR_COLOR 0x20000
#define FO_NEW_VERTEX_BUFFER 0x40000
#define FO_NEW_VERTEX_ELEMENT 0x80000
#define FO_NEW_SAMPLE_MASK 0x100000
#define FO_NEW_INDEX_BUFFER 0x200000
#define FO_HW 0
#define FO_SW 1
struct fo_state {
void *sw_state;
void *hw_state;
};
struct fo_sampler_view {
struct pipe_sampler_view base;
struct pipe_sampler_view *sw;
struct pipe_sampler_view *hw;
};
struct failover_context {
struct pipe_context pipe; /**< base class */
/* The most recent drawing state as set by the driver:
*/
const struct fo_state *blend;
const struct fo_state *sampler[PIPE_MAX_SAMPLERS];
const struct fo_state *vertex_samplers[PIPE_MAX_VERTEX_SAMPLERS];
const struct fo_state *depth_stencil;
const struct fo_state *rasterizer;
const struct fo_state *fragment_shader;
const struct fo_state *vertex_shader;
const struct fo_state *vertex_elements;
struct pipe_blend_color blend_color;
struct pipe_stencil_ref stencil_ref;
struct pipe_clip_state clip;
unsigned sample_mask;
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS];
struct pipe_index_buffer index_buffer;
uint num_vertex_buffers;
void *sw_sampler_state[PIPE_MAX_SAMPLERS];
void *hw_sampler_state[PIPE_MAX_SAMPLERS];
void *sw_vertex_sampler_state[PIPE_MAX_VERTEX_SAMPLERS];
void *hw_vertex_sampler_state[PIPE_MAX_VERTEX_SAMPLERS];
struct fo_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
struct fo_sampler_view *vertex_sampler_views[PIPE_MAX_VERTEX_SAMPLERS];
unsigned num_fragment_sampler_views;
unsigned num_vertex_sampler_views;
unsigned dirty;
unsigned num_samplers;
unsigned num_vertex_samplers;
unsigned mode;
struct pipe_context *hw;
struct pipe_context *sw;
};
void failover_init_state_functions( struct failover_context *failover );
void failover_state_emit( struct failover_context *failover );
static INLINE struct failover_context *
failover_context( struct pipe_context *pipe )
{
return (struct failover_context *)pipe;
}
/* Internal functions
*/
void
failover_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
struct pipe_resource *resource);
#endif /* FO_CONTEXT_H */

661
src/gallium/drivers/failover/fo_state.c
View File

@@ -1,661 +0,0 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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 TUNGSTEN GRAPHICS 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.
*
**************************************************************************/
/* Authors: Keith Whitwell <keith@tungstengraphics.com>
*/
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_transfer.h"
#include "fo_context.h"
/* This looks like a lot of work at the moment - we're keeping a
* duplicate copy of the state up-to-date.
*
* This can change in two ways:
* - With constant state objects we would only need to save a pointer,
* not the whole object.
* - By adding a callback in the state tracker to re-emit state. The
* state tracker knows the current state already and can re-emit it
* without additional complexity.
*
* This works as a proof-of-concept, but a final version will have
* lower overheads.
*/
static void *
failover_create_blend_state( struct pipe_context *pipe,
const struct pipe_blend_state *blend )
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_blend_state(failover->sw, blend);
state->hw_state = failover->hw->create_blend_state(failover->hw, blend);
return state;
}
static void
failover_bind_blend_state( struct pipe_context *pipe,
void *blend )
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state *)blend;
failover->blend = state;
failover->dirty |= FO_NEW_BLEND;
failover->sw->bind_blend_state( failover->sw, state->sw_state );
failover->hw->bind_blend_state( failover->hw, state->hw_state );
}
static void
failover_delete_blend_state( struct pipe_context *pipe,
void *blend )
{
struct fo_state *state = (struct fo_state*)blend;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_blend_state(failover->sw, state->sw_state);
failover->hw->delete_blend_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void
failover_set_blend_color( struct pipe_context *pipe,
const struct pipe_blend_color *blend_color )
{
struct failover_context *failover = failover_context(pipe);
failover->blend_color = *blend_color;
failover->dirty |= FO_NEW_BLEND_COLOR;
failover->sw->set_blend_color( failover->sw, blend_color );
failover->hw->set_blend_color( failover->hw, blend_color );
}
static void
failover_set_stencil_ref( struct pipe_context *pipe,
const struct pipe_stencil_ref *stencil_ref )
{
struct failover_context *failover = failover_context(pipe);
failover->stencil_ref = *stencil_ref;
failover->dirty |= FO_NEW_STENCIL_REF;
failover->sw->set_stencil_ref( failover->sw, stencil_ref );
failover->hw->set_stencil_ref( failover->hw, stencil_ref );
}
static void
failover_set_clip_state( struct pipe_context *pipe,
const struct pipe_clip_state *clip )
{
struct failover_context *failover = failover_context(pipe);
failover->clip = *clip;
failover->dirty |= FO_NEW_CLIP;
failover->sw->set_clip_state( failover->sw, clip );
failover->hw->set_clip_state( failover->hw, clip );
}
static void
failover_set_sample_mask(struct pipe_context *pipe,
unsigned sample_mask)
{
struct failover_context *failover = failover_context(pipe);
failover->sample_mask = sample_mask;
failover->dirty |= FO_NEW_SAMPLE_MASK;
failover->sw->set_sample_mask( failover->sw, sample_mask );
failover->hw->set_sample_mask( failover->hw, sample_mask );
}
static void *
failover_create_depth_stencil_state(struct pipe_context *pipe,
const struct pipe_depth_stencil_alpha_state *templ)
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_depth_stencil_alpha_state(failover->sw, templ);
state->hw_state = failover->hw->create_depth_stencil_alpha_state(failover->hw, templ);
return state;
}
static void
failover_bind_depth_stencil_state(struct pipe_context *pipe,
void *depth_stencil)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state *)depth_stencil;
failover->depth_stencil = state;
failover->dirty |= FO_NEW_DEPTH_STENCIL;
failover->sw->bind_depth_stencil_alpha_state(failover->sw, state->sw_state);
failover->hw->bind_depth_stencil_alpha_state(failover->hw, state->hw_state);
}
static void
failover_delete_depth_stencil_state(struct pipe_context *pipe,
void *ds)
{
struct fo_state *state = (struct fo_state*)ds;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_depth_stencil_alpha_state(failover->sw, state->sw_state);
failover->hw->delete_depth_stencil_alpha_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void
failover_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_framebuffer_state *framebuffer)
{
struct failover_context *failover = failover_context(pipe);
failover->framebuffer = *framebuffer;
failover->dirty |= FO_NEW_FRAMEBUFFER;
failover->sw->set_framebuffer_state( failover->sw, framebuffer );
failover->hw->set_framebuffer_state( failover->hw, framebuffer );
}
static void *
failover_create_fs_state(struct pipe_context *pipe,
const struct pipe_shader_state *templ)
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_fs_state(failover->sw, templ);
state->hw_state = failover->hw->create_fs_state(failover->hw, templ);
return state;
}
static void
failover_bind_fs_state(struct pipe_context *pipe, void *fs)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)fs;
failover->fragment_shader = state;
failover->dirty |= FO_NEW_FRAGMENT_SHADER;
failover->sw->bind_fs_state(failover->sw, state->sw_state);
failover->hw->bind_fs_state(failover->hw, state->hw_state);
}
static void
failover_delete_fs_state(struct pipe_context *pipe,
void *fs)
{
struct fo_state *state = (struct fo_state*)fs;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_fs_state(failover->sw, state->sw_state);
failover->hw->delete_fs_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void *
failover_create_vs_state(struct pipe_context *pipe,
const struct pipe_shader_state *templ)
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_vs_state(failover->sw, templ);
state->hw_state = failover->hw->create_vs_state(failover->hw, templ);
return state;
}
static void
failover_bind_vs_state(struct pipe_context *pipe,
void *vs)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)vs;
failover->vertex_shader = state;
failover->dirty |= FO_NEW_VERTEX_SHADER;
failover->sw->bind_vs_state(failover->sw, state->sw_state);
failover->hw->bind_vs_state(failover->hw, state->hw_state);
}
static void
failover_delete_vs_state(struct pipe_context *pipe,
void *vs)
{
struct fo_state *state = (struct fo_state*)vs;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_vs_state(failover->sw, state->sw_state);
failover->hw->delete_vs_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void *
failover_create_vertex_elements_state( struct pipe_context *pipe,
unsigned count,
const struct pipe_vertex_element *velems )
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_vertex_elements_state(failover->sw, count, velems);
state->hw_state = failover->hw->create_vertex_elements_state(failover->hw, count, velems);
return state;
}
static void
failover_bind_vertex_elements_state(struct pipe_context *pipe,
void *velems )
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)velems;
failover->vertex_elements = state;
failover->dirty |= FO_NEW_VERTEX_ELEMENT;
failover->sw->bind_vertex_elements_state( failover->sw, velems );
failover->hw->bind_vertex_elements_state( failover->hw, velems );
}
static void
failover_delete_vertex_elements_state( struct pipe_context *pipe,
void *velems )
{
struct fo_state *state = (struct fo_state*)velems;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_vertex_elements_state(failover->sw, state->sw_state);
failover->hw->delete_vertex_elements_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void
failover_set_polygon_stipple( struct pipe_context *pipe,
const struct pipe_poly_stipple *stipple )
{
struct failover_context *failover = failover_context(pipe);
failover->poly_stipple = *stipple;
failover->dirty |= FO_NEW_STIPPLE;
failover->sw->set_polygon_stipple( failover->sw, stipple );
failover->hw->set_polygon_stipple( failover->hw, stipple );
}
static void *
failover_create_rasterizer_state(struct pipe_context *pipe,
const struct pipe_rasterizer_state *templ)
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_rasterizer_state(failover->sw, templ);
state->hw_state = failover->hw->create_rasterizer_state(failover->hw, templ);
return state;
}
static void
failover_bind_rasterizer_state(struct pipe_context *pipe,
void *raster)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)raster;
failover->rasterizer = state;
failover->dirty |= FO_NEW_RASTERIZER;
failover->sw->bind_rasterizer_state(failover->sw, state->sw_state);
failover->hw->bind_rasterizer_state(failover->hw, state->hw_state);
}
static void
failover_delete_rasterizer_state(struct pipe_context *pipe,
void *raster)
{
struct fo_state *state = (struct fo_state*)raster;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_rasterizer_state(failover->sw, state->sw_state);
failover->hw->delete_rasterizer_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static void
failover_set_scissor_state( struct pipe_context *pipe,
const struct pipe_scissor_state *scissor )
{
struct failover_context *failover = failover_context(pipe);
failover->scissor = *scissor;
failover->dirty |= FO_NEW_SCISSOR;
failover->sw->set_scissor_state( failover->sw, scissor );
failover->hw->set_scissor_state( failover->hw, scissor );
}
static void *
failover_create_sampler_state(struct pipe_context *pipe,
const struct pipe_sampler_state *templ)
{
struct fo_state *state = MALLOC(sizeof(struct fo_state));
struct failover_context *failover = failover_context(pipe);
state->sw_state = failover->sw->create_sampler_state(failover->sw, templ);
state->hw_state = failover->hw->create_sampler_state(failover->hw, templ);
return state;
}
static void
failover_bind_fragment_sampler_states(struct pipe_context *pipe,
unsigned num,
void **sampler)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)sampler;
uint i;
assert(num <= PIPE_MAX_SAMPLERS);
/* Check for no-op */
if (num == failover->num_samplers &&
!memcmp(failover->sampler, sampler, num * sizeof(void *)))
return;
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
failover->sw_sampler_state[i] = i < num ? state[i].sw_state : NULL;
failover->hw_sampler_state[i] = i < num ? state[i].hw_state : NULL;
}
failover->dirty |= FO_NEW_SAMPLER;
failover->num_samplers = num;
failover->sw->bind_fragment_sampler_states(failover->sw, num,
failover->sw_sampler_state);
failover->hw->bind_fragment_sampler_states(failover->hw, num,
failover->hw_sampler_state);
}
static void
failover_bind_vertex_sampler_states(struct pipe_context *pipe,
unsigned num_samplers,
void **samplers)
{
struct failover_context *failover = failover_context(pipe);
struct fo_state *state = (struct fo_state*)samplers;
uint i;
assert(num_samplers <= PIPE_MAX_VERTEX_SAMPLERS);
/* Check for no-op */
if (num_samplers == failover->num_vertex_samplers &&
!memcmp(failover->vertex_samplers, samplers, num_samplers * sizeof(void *))) {
return;
}
for (i = 0; i < PIPE_MAX_VERTEX_SAMPLERS; i++) {
failover->sw_vertex_sampler_state[i] = i < num_samplers ? state[i].sw_state : NULL;
failover->hw_vertex_sampler_state[i] = i < num_samplers ? state[i].hw_state : NULL;
}
failover->dirty |= FO_NEW_SAMPLER;
failover->num_vertex_samplers = num_samplers;
failover->sw->bind_vertex_sampler_states(failover->sw,
num_samplers,
failover->sw_vertex_sampler_state);
failover->hw->bind_vertex_sampler_states(failover->hw,
num_samplers,
failover->hw_vertex_sampler_state);
}
static void
failover_delete_sampler_state(struct pipe_context *pipe, void *sampler)
{
struct fo_state *state = (struct fo_state*)sampler;
struct failover_context *failover = failover_context(pipe);
failover->sw->delete_sampler_state(failover->sw, state->sw_state);
failover->hw->delete_sampler_state(failover->hw, state->hw_state);
state->sw_state = 0;
state->hw_state = 0;
FREE(state);
}
static struct pipe_sampler_view *
failover_create_sampler_view(struct pipe_context *pipe,
struct pipe_resource *texture,
const struct pipe_sampler_view *templ)
{
struct fo_sampler_view *view = MALLOC(sizeof(struct fo_sampler_view));
struct failover_context *failover = failover_context(pipe);
view->sw = failover->sw->create_sampler_view(failover->sw, texture, templ);
view->hw = failover->hw->create_sampler_view(failover->hw, texture, templ);
view->base = *templ;
view->base.reference.count = 1;
view->base.texture = NULL;
pipe_resource_reference(&view->base.texture, texture);
view->base.context = pipe;
return &view->base;
}
static void
failover_sampler_view_destroy(struct pipe_context *pipe,
struct pipe_sampler_view *view)
{
struct fo_sampler_view *fo_view = (struct fo_sampler_view *)view;
struct failover_context *failover = failover_context(pipe);
failover->sw->sampler_view_destroy(failover->sw, fo_view->sw);
failover->hw->sampler_view_destroy(failover->hw, fo_view->hw);
pipe_resource_reference(&fo_view->base.texture, NULL);
FREE(fo_view);
}
static void
failover_set_fragment_sampler_views(struct pipe_context *pipe,
unsigned num,
struct pipe_sampler_view **views)
{
struct failover_context *failover = failover_context(pipe);
struct pipe_sampler_view *hw_views[PIPE_MAX_SAMPLERS];
uint i;
assert(num <= PIPE_MAX_SAMPLERS);
/* Check for no-op */
if (num == failover->num_fragment_sampler_views &&
!memcmp(failover->fragment_sampler_views, views, num * sizeof(struct pipe_sampler_view *)))
return;
for (i = 0; i < num; i++) {
struct fo_sampler_view *fo_view = (struct fo_sampler_view *)views[i];
pipe_sampler_view_reference((struct pipe_sampler_view **)&failover->fragment_sampler_views[i], views[i]);
hw_views[i] = fo_view->hw;
}
for (i = num; i < failover->num_fragment_sampler_views; i++)
pipe_sampler_view_reference((struct pipe_sampler_view **)&failover->fragment_sampler_views[i], NULL);
failover->dirty |= FO_NEW_SAMPLER_VIEW;
failover->num_fragment_sampler_views = num;
failover->hw->set_fragment_sampler_views(failover->hw, num, hw_views);
}
static void
failover_set_vertex_sampler_views(struct pipe_context *pipe,
unsigned num,
struct pipe_sampler_view **views)
{
struct failover_context *failover = failover_context(pipe);
struct pipe_sampler_view *hw_views[PIPE_MAX_VERTEX_SAMPLERS];
uint i;
assert(num <= PIPE_MAX_VERTEX_SAMPLERS);
/* Check for no-op */
if (num == failover->num_vertex_sampler_views &&
!memcmp(failover->vertex_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) {
return;
}
for (i = 0; i < num; i++) {
struct fo_sampler_view *fo_view = (struct fo_sampler_view *)views[i];
pipe_sampler_view_reference((struct pipe_sampler_view **)&failover->vertex_sampler_views[i], views[i]);
hw_views[i] = fo_view->hw;
}
for (i = num; i < failover->num_vertex_sampler_views; i++)
pipe_sampler_view_reference((struct pipe_sampler_view **)&failover->vertex_sampler_views[i], NULL);
failover->dirty |= FO_NEW_SAMPLER_VIEW;
failover->num_vertex_sampler_views = num;
failover->hw->set_vertex_sampler_views(failover->hw, num, hw_views);
}
static void
failover_set_viewport_state( struct pipe_context *pipe,
const struct pipe_viewport_state *viewport )
{
struct failover_context *failover = failover_context(pipe);
failover->viewport = *viewport;
failover->dirty |= FO_NEW_VIEWPORT;
failover->sw->set_viewport_state( failover->sw, viewport );
failover->hw->set_viewport_state( failover->hw, viewport );
}
static void
failover_set_vertex_buffers(struct pipe_context *pipe,
unsigned count,
const struct pipe_vertex_buffer *vertex_buffers)
{
struct failover_context *failover = failover_context(pipe);
util_copy_vertex_buffers(failover->vertex_buffers,
&failover->num_vertex_buffers,
vertex_buffers, count);
failover->dirty |= FO_NEW_VERTEX_BUFFER;
failover->sw->set_vertex_buffers( failover->sw, count, vertex_buffers );
failover->hw->set_vertex_buffers( failover->hw, count, vertex_buffers );
}
static void
failover_set_index_buffer(struct pipe_context *pipe,
const struct pipe_index_buffer *ib)
{
struct failover_context *failover = failover_context(pipe);
if (ib)
memcpy(&failover->index_buffer, ib, sizeof(failover->index_buffer));
else
memset(&failover->index_buffer, 0, sizeof(failover->index_buffer));
failover->dirty |= FO_NEW_INDEX_BUFFER;
failover->sw->set_index_buffer( failover->sw, ib );
failover->hw->set_index_buffer( failover->hw, ib );
}
void
failover_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
struct pipe_resource *res)
{
struct failover_context *failover = failover_context(pipe);
assert(shader < PIPE_SHADER_TYPES);
assert(index == 0);
failover->sw->set_constant_buffer(failover->sw, shader, index, res);
failover->hw->set_constant_buffer(failover->hw, shader, index, res);
}
void
failover_init_state_functions( struct failover_context *failover )
{
failover->pipe.create_blend_state = failover_create_blend_state;
failover->pipe.bind_blend_state = failover_bind_blend_state;
failover->pipe.delete_blend_state = failover_delete_blend_state;
failover->pipe.create_sampler_state = failover_create_sampler_state;
failover->pipe.bind_fragment_sampler_states = failover_bind_fragment_sampler_states;
failover->pipe.bind_vertex_sampler_states = failover_bind_vertex_sampler_states;
failover->pipe.delete_sampler_state = failover_delete_sampler_state;
failover->pipe.create_depth_stencil_alpha_state = failover_create_depth_stencil_state;
failover->pipe.bind_depth_stencil_alpha_state = failover_bind_depth_stencil_state;
failover->pipe.delete_depth_stencil_alpha_state = failover_delete_depth_stencil_state;
failover->pipe.create_rasterizer_state = failover_create_rasterizer_state;
failover->pipe.bind_rasterizer_state = failover_bind_rasterizer_state;
failover->pipe.delete_rasterizer_state = failover_delete_rasterizer_state;
failover->pipe.create_fs_state = failover_create_fs_state;
failover->pipe.bind_fs_state = failover_bind_fs_state;
failover->pipe.delete_fs_state = failover_delete_fs_state;
failover->pipe.create_vs_state = failover_create_vs_state;
failover->pipe.bind_vs_state = failover_bind_vs_state;
failover->pipe.delete_vs_state = failover_delete_vs_state;
failover->pipe.create_vertex_elements_state = failover_create_vertex_elements_state;
failover->pipe.bind_vertex_elements_state = failover_bind_vertex_elements_state;
failover->pipe.delete_vertex_elements_state = failover_delete_vertex_elements_state;
failover->pipe.set_blend_color = failover_set_blend_color;
failover->pipe.set_stencil_ref = failover_set_stencil_ref;
failover->pipe.set_clip_state = failover_set_clip_state;
failover->pipe.set_sample_mask = failover_set_sample_mask;
failover->pipe.set_framebuffer_state = failover_set_framebuffer_state;
failover->pipe.set_polygon_stipple = failover_set_polygon_stipple;
failover->pipe.set_scissor_state = failover_set_scissor_state;
failover->pipe.set_fragment_sampler_views = failover_set_fragment_sampler_views;
failover->pipe.set_vertex_sampler_views = failover_set_vertex_sampler_views;
failover->pipe.set_viewport_state = failover_set_viewport_state;
failover->pipe.set_vertex_buffers = failover_set_vertex_buffers;
failover->pipe.set_index_buffer = failover_set_index_buffer;
failover->pipe.set_constant_buffer = failover_set_constant_buffer;
failover->pipe.create_sampler_view = failover_create_sampler_view;
failover->pipe.sampler_view_destroy = failover_sampler_view_destroy;
failover->pipe.redefine_user_buffer = u_default_redefine_user_buffer;
}

144
src/gallium/drivers/failover/fo_state_emit.c
View File

@@ -1,144 +0,0 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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 TUNGSTEN GRAPHICS 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.
*
**************************************************************************/
/* Authors: Keith Whitwell <keith@tungstengraphics.com>
*/
#include "fo_context.h"
/* This looks like a lot of work at the moment - we're keeping a
* duplicate copy of the state up-to-date.
*
* This can change in two ways:
* - With constant state objects we would only need to save a pointer,
* not the whole object.
* - By adding a callback in the state tracker to re-emit state. The
* state tracker knows the current state already and can re-emit it
* without additional complexity.
*
* This works as a proof-of-concept, but a final version will have
* lower overheads.
*/
/* Bring the software pipe uptodate with current state.
*
* With constant state objects we would probably just send all state
* to both rasterizers all the time???
*/
void
failover_state_emit( struct failover_context *failover )
{
if (failover->dirty & FO_NEW_BLEND)
failover->sw->bind_blend_state( failover->sw,
failover->blend->sw_state );
if (failover->dirty & FO_NEW_BLEND_COLOR)
failover->sw->set_blend_color( failover->sw, &failover->blend_color );
if (failover->dirty & FO_NEW_CLIP)
failover->sw->set_clip_state( failover->sw, &failover->clip );
if (failover->dirty & FO_NEW_SAMPLE_MASK)
failover->sw->set_sample_mask( failover->sw, failover->sample_mask );
if (failover->dirty & FO_NEW_DEPTH_STENCIL)
failover->sw->bind_depth_stencil_alpha_state( failover->sw,
failover->depth_stencil->sw_state );
if (failover->dirty & FO_NEW_STENCIL_REF)
failover->sw->set_stencil_ref( failover->sw, &failover->stencil_ref );
if (failover->dirty & FO_NEW_FRAMEBUFFER)
failover->sw->set_framebuffer_state( failover->sw, &failover->framebuffer );
if (failover->dirty & FO_NEW_FRAGMENT_SHADER)
failover->sw->bind_fs_state( failover->sw,
failover->fragment_shader->sw_state );
if (failover->dirty & FO_NEW_VERTEX_SHADER)
failover->sw->bind_vs_state( failover->sw,
failover->vertex_shader->sw_state );
if (failover->dirty & FO_NEW_VERTEX_ELEMENT)
failover->sw->bind_vertex_elements_state( failover->sw,
failover->vertex_elements->sw_state );
if (failover->dirty & FO_NEW_STIPPLE)
failover->sw->set_polygon_stipple( failover->sw, &failover->poly_stipple );
if (failover->dirty & FO_NEW_RASTERIZER)
failover->sw->bind_rasterizer_state( failover->sw,
failover->rasterizer->sw_state );
if (failover->dirty & FO_NEW_SCISSOR)
failover->sw->set_scissor_state( failover->sw, &failover->scissor );
if (failover->dirty & FO_NEW_VIEWPORT)
failover->sw->set_viewport_state( failover->sw, &failover->viewport );
if (failover->dirty & FO_NEW_SAMPLER) {
failover->sw->bind_fragment_sampler_states( failover->sw, failover->num_samplers,
failover->sw_sampler_state );
failover->sw->bind_vertex_sampler_states(failover->sw,
failover->num_vertex_samplers,
failover->sw_vertex_sampler_state);
}
if (failover->dirty & FO_NEW_SAMPLER_VIEW) {
struct pipe_sampler_view *fragment_views[PIPE_MAX_SAMPLERS];
struct pipe_sampler_view *vertex_views[PIPE_MAX_VERTEX_SAMPLERS];
uint i;
for (i = 0; i < failover->num_fragment_sampler_views; i++) {
fragment_views[i] = failover->fragment_sampler_views[i]->sw;
}
failover->sw->set_fragment_sampler_views(failover->sw,
failover->num_fragment_sampler_views,
fragment_views);
for (i = 0; i < failover->num_vertex_sampler_views; i++) {
vertex_views[i] = failover->vertex_sampler_views[i]->sw;
}
failover->sw->set_vertex_sampler_views(failover->sw,
failover->num_vertex_sampler_views,
vertex_views);
}
if (failover->dirty & FO_NEW_VERTEX_BUFFER) {
failover->sw->set_vertex_buffers( failover->sw,
failover->num_vertex_buffers,
failover->vertex_buffers );
}
if (failover->dirty & FO_NEW_INDEX_BUFFER) {
failover->sw->set_index_buffer( failover->sw,
&failover->index_buffer );
}
failover->dirty = 0;
}

48
src/gallium/drivers/failover/fo_winsys.h
View File

@@ -1,48 +0,0 @@
/**************************************************************************
*
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
* 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 TUNGSTEN GRAPHICS 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 FO_WINSYS_H
#define FO_WINSYS_H
/* This is the interface that failover requires any window system
* hosting it to implement. This is the only include file in failover
* which is public.
*/
struct pipe_context;
struct failover_context;
struct pipe_context *failover_create( struct pipe_context *hw,
struct pipe_context *sw );
void failover_fail_over( struct failover_context *failover );
#endif /* FO_WINSYS_H */

1
src/mesa/state_tracker/st_draw_feedback.c
View File

@@ -88,7 +88,6 @@ set_feedback_vertex_format(struct gl_context *ctx)
* to implement glRasterPos.
* This is very much like the normal draw_vbo() function above.
* Look at code refactoring some day.
* Might move this into the failover module some day.
*/
void
st_feedback_draw_vbo(struct gl_context *ctx,