Commit d6287a94 authored by Marek Olšák's avatar Marek Olšák

gallium: rename 'state tracker' to 'frontend'

Acked-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
Acked-by: Alyssa Rosenzweig's avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer's avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <!4902>
parent b408734e
...@@ -77,7 +77,7 @@ each directory. ...@@ -77,7 +77,7 @@ each directory.
<li><b>program</b> - Vertex/fragment shader and GLSL compiler code <li><b>program</b> - Vertex/fragment shader and GLSL compiler code
<li><b>sparc</b> - Assembly code/optimizations for SPARC systems <li><b>sparc</b> - Assembly code/optimizations for SPARC systems
(not used with Gallium) (not used with Gallium)
<li><b>state_tracker</b> - State tracker / driver for Gallium. This <li><b>state_tracker</b> - Translator from Mesa to Gallium. This
is basically a Mesa device driver that speaks to Gallium. This is basically a Mesa device driver that speaks to Gallium. This
directory may be moved to src/mesa/drivers/gallium at some point. directory may be moved to src/mesa/drivers/gallium at some point.
<li><b>swrast</b> - Software rasterization module. For drawing points, <li><b>swrast</b> - Software rasterization module. For drawing points,
...@@ -127,7 +127,7 @@ each directory. ...@@ -127,7 +127,7 @@ each directory.
vertex shaders. vertex shaders.
Geometry shaders will also be implemented in this module. Geometry shaders will also be implemented in this module.
<li><b>cso_cache</b> - Constant State Objects Cache. Used to filter out <li><b>cso_cache</b> - Constant State Objects Cache. Used to filter out
redundant state changes between state trackers and drivers. redundant state changes between frontends and drivers.
<li><b>gallivm</b> - LLVM module for Gallium. For LLVM-based <li><b>gallivm</b> - LLVM module for Gallium. For LLVM-based
compilation, optimization and code generation for TGSI shaders. compilation, optimization and code generation for TGSI shaders.
Incomplete. Incomplete.
...@@ -144,17 +144,17 @@ each directory. ...@@ -144,17 +144,17 @@ each directory.
creation, memory management, 2D blitting, simple rendering, etc. creation, memory management, 2D blitting, simple rendering, etc.
<li>XXX more <li>XXX more
</ul> </ul>
<li><b>state_trackers</b> - <li><b>frontends</b> -
<ul> <ul>
<li><b>clover</b> - OpenCL state tracker <li><b>clover</b> - OpenCL frontend
<li><b>dri</b> - Meta state tracker for DRI drivers <li><b>dri</b> - Meta frontend for DRI drivers
<li><b>glx</b> - Meta state tracker for GLX <li><b>glx</b> - Meta frontend for GLX
<li><b>wgl</b> - Windows WGL state tracker <li><b>wgl</b> - Windows WGL frontend
<li><b>xa</b> - XA state tracker <li><b>xa</b> - XA frontend
<li><b>xvmc</b> - XvMC state tracker <li><b>xvmc</b> - XvMC frontend
<li><b>vdpau</b> - VDPAU state tracker <li><b>vdpau</b> - VDPAU frontend
<li><b>va</b> - VA-API state tracker <li><b>va</b> - VA-API frontend
<li><b>omx_bellagio</b> - OpenMAX Bellagio state tracker <li><b>omx_bellagio</b> - OpenMAX Bellagio frontend
</ul> </ul>
<li><b>winsys</b> - <li><b>winsys</b> -
<ul> <ul>
......
...@@ -46,7 +46,7 @@ SUBDIRS += winsys/vc4/drm drivers/vc4 ...@@ -46,7 +46,7 @@ SUBDIRS += winsys/vc4/drm drivers/vc4
SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl
SUBDIRS += winsys/svga/drm drivers/svga SUBDIRS += winsys/svga/drm drivers/svga
SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
SUBDIRS += state_trackers/dri SUBDIRS += frontends/dri
SUBDIRS += winsys/iris/drm drivers/iris SUBDIRS += winsys/iris/drm drivers/iris
SUBDIRS += winsys/lima/drm drivers/lima SUBDIRS += winsys/lima/drm drivers/lima
SUBDIRS += winsys/panfrost/drm drivers/panfrost SUBDIRS += winsys/panfrost/drm drivers/panfrost
......
...@@ -45,12 +45,12 @@ if env['platform'] == 'windows': ...@@ -45,12 +45,12 @@ if env['platform'] == 'windows':
if not env['embedded']: if not env['embedded']:
if env['x11']: if env['x11']:
SConscript([ SConscript([
'state_trackers/glx/xlib/SConscript', 'frontends/glx/xlib/SConscript',
'targets/libgl-xlib/SConscript', 'targets/libgl-xlib/SConscript',
]) ])
if env['platform'] == 'windows': if env['platform'] == 'windows':
SConscript([ SConscript([
'state_trackers/wgl/SConscript', 'frontends/wgl/SConscript',
'targets/libgl-gdi/SConscript', 'targets/libgl-gdi/SConscript',
]) ])
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define PIPE_LOADER_H #define PIPE_LOADER_H
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "util/xmlconfig.h" #include "util/xmlconfig.h"
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "loader.h" #include "loader.h"
#include "target-helpers/drm_helper_public.h" #include "target-helpers/drm_helper_public.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "pipe_loader_priv.h" #include "pipe_loader_priv.h"
#include "util/u_memory.h" #include "util/u_memory.h"
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
#include "sw/null/null_sw_winsys.h" #include "sw/null/null_sw_winsys.h"
#include "sw/wrapper/wrapper_sw_winsys.h" #include "sw/wrapper/wrapper_sw_winsys.h"
#include "target-helpers/sw_helper_public.h" #include "target-helpers/sw_helper_public.h"
#include "state_tracker/drisw_api.h" #include "frontend/drisw_api.h"
#include "state_tracker/sw_driver.h" #include "frontend/sw_driver.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
struct pipe_loader_sw_device { struct pipe_loader_sw_device {
struct pipe_loader_device base; struct pipe_loader_device base;
......
...@@ -65,7 +65,7 @@ drivers/dri/common/xmlpool/t_options.h, and regenerate options.h by running make ...@@ -65,7 +65,7 @@ drivers/dri/common/xmlpool/t_options.h, and regenerate options.h by running make
directory. Use the name you put into filters.h as the config option name. directory. Use the name you put into filters.h as the config option name.
With driconf aware of the option, make Gallium aware of it too. Add it to With driconf aware of the option, make Gallium aware of it too. Add it to
state_trackers/dri/common/dri_screen.c in a proper section, specifying its default value and frontends/dri/common/dri_screen.c in a proper section, specifying its default value and
the accepted range (if applicable). the accepted range (if applicable).
Do check that __driNConfigOptions is still correct after the addition. Do check that __driNConfigOptions is still correct after the addition.
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <xf86drm.h> #include <xf86drm.h>
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#include "util/format/u_format.h" #include "util/format/u_format.h"
#include "util/u_inlines.h" #include "util/u_inlines.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define RENDERONLY_H #define RENDERONLY_H
#include <stdint.h> #include <stdint.h>
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
struct renderonly_scanout { struct renderonly_scanout {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "target-helpers/inline_debug_helper.h" #include "target-helpers/inline_debug_helper.h"
#include "target-helpers/drm_helper_public.h" #include "target-helpers/drm_helper_public.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "util/xmlpool.h" #include "util/xmlpool.h"
#ifdef GALLIUM_I915 #ifdef GALLIUM_I915
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
#ifdef GALLIUM_SWR #ifdef GALLIUM_SWR
#include "swr/swr_public.h" #include "swr/swr_public.h"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "target-helpers/sw_helper_public.h" #include "target-helpers/sw_helper_public.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
/* Helper function to choose and instantiate one of the software rasterizers: /* Helper function to choose and instantiate one of the software rasterizers:
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "tgsi/tgsi_strings.h" #include "tgsi/tgsi_strings.h"
#include "tgsi/tgsi_text.h" #include "tgsi/tgsi_text.h"
#include "cso_cache/cso_context.h" #include "cso_cache/cso_context.h"
#include "state_tracker/winsys_handle.h" #include "frontend/winsys_handle.h"
#include <stdio.h> #include <stdio.h>
#define TOLERANCE 0.01 #define TOLERANCE 0.01
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "pipe/p_context.h" #include "pipe/p_context.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
#include "pipe-loader/pipe_loader.h" #include "pipe-loader/pipe_loader.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/crc32.h" #include "util/crc32.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#include "pipe-loader/pipe_loader.h" #include "pipe-loader/pipe_loader.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "util/u_memory.h" #include "util/u_memory.h"
#include "vl/vl_winsys.h" #include "vl/vl_winsys.h"
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "util/u_screen.h" #include "util/u_screen.h"
#include "util/u_string.h" #include "util/u_string.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "drm-uapi/drm_fourcc.h" #include "drm-uapi/drm_fourcc.h"
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include <errno.h> #include <errno.h>
/* XXX this should go away, needed for 'struct winsys_handle' */ /* XXX this should go away, needed for 'struct winsys_handle' */
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
/* A private modifier for now, so we have a way to request tiled but not /* A private modifier for now, so we have a way to request tiled but not
* compressed. It would perhaps be good to get real modifiers for the * compressed. It would perhaps be good to get real modifiers for the
......
...@@ -289,7 +289,7 @@ struct i915_context { ...@@ -289,7 +289,7 @@ struct i915_context {
struct blitter_context* blitter; struct blitter_context* blitter;
}; };
/* A flag for each state_tracker state object: /* A flag for each frontend state object:
*/ */
#define I915_NEW_VIEWPORT 0x1 #define I915_NEW_VIEWPORT 0x1
#define I915_NEW_RASTERIZER 0x2 #define I915_NEW_RASTERIZER 0x2
......
...@@ -113,7 +113,7 @@ i915_create_blend_state(struct pipe_context *pipe, ...@@ -113,7 +113,7 @@ i915_create_blend_state(struct pipe_context *pipe,
unsigned dstA = blend->rt[0].alpha_dst_factor; unsigned dstA = blend->rt[0].alpha_dst_factor;
/* Special handling for MIN/MAX filter modes handled at /* Special handling for MIN/MAX filter modes handled at
* state_tracker level. * frontend level.
*/ */
if (srcA != srcRGB || if (srcA != srcRGB ||
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define IRIS_SCREEN_H #define IRIS_SCREEN_H
#include "pipe/p_screen.h" #include "pipe/p_screen.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "util/disk_cache.h" #include "util/disk_cache.h"
#include "util/slab.h" #include "util/slab.h"
#include "util/u_screen.h" #include "util/u_screen.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "util/os_time.h" #include "util/os_time.h"
#include "os/os_mman.h" #include "os/os_mman.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "lima_screen.h" #include "lima_screen.h"
#include "lima_bo.h" #include "lima_bo.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "util/u_drm.h" #include "util/u_drm.h"
#include "renderonly/renderonly.h" #include "renderonly/renderonly.h"
#include "state_tracker/drm_driver.h" #include "frontend/drm_driver.h"
#include "drm-uapi/drm_fourcc.h" #include "drm-uapi/drm_fourcc.h"
#include "drm-uapi/lima_drm.h" #include "drm-uapi/lima_drm.h"
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "lp_rast.h" #include "lp_rast.h"
#include "lp_cs_tpool.h" #include "lp_cs_tpool.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
#include "nir.h" #include "nir.h"
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include "lp_setup_context.h" #include "lp_setup_context.h"
#include "lp_screen.h" #include "lp_screen.h"
#include "lp_state.h" #include "lp_state.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
#include "draw/draw_context.h" #include "draw/draw_context.h"
#include "draw/draw_vbuf.h" #include "draw/draw_vbuf.h"
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "lp_screen.h" #include "lp_screen.h"
#include "lp_memory.h" #include "lp_memory.h"
#include "lp_cs_tpool.h" #include "lp_cs_tpool.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
#include "nir/nir_to_tgsi_info.h" #include "nir/nir_to_tgsi_info.h"
#include "nir_serialize.h" #include "nir_serialize.h"
struct lp_cs_job_info { struct lp_cs_job_info {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "lp_screen.h" #include "lp_screen.h"
#include "lp_state.h" #include "lp_state.h"
#include "lp_debug.h" #include "lp_debug.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
static void * static void *
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "lp_state.h" #include "lp_state.h"
#include "lp_rast.h" #include "lp_rast.h"
#include "state_tracker/sw_winsys.h" #include "frontend/sw_winsys.h"
#ifdef DEBUG #ifdef DEBUG
......