From 87f7d61e1973fe8279833d966daf75708f312b0e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 28 Oct 2015 14:39:45 +0000 Subject: virgl: move virgl_hw.h into the driver dir Strictly speaking virgl_hw.h should reside in the driver folder, as it describes the hardware. Moving it allows us to nuke the following strange dependency winsys/vtest > driver > winsys/drm Signed-off-by: Emil Velikov Reviewed-by: Dave Airlie --- src/gallium/winsys/virgl/drm/Makefile.am | 1 - src/gallium/winsys/virgl/drm/Makefile.sources | 1 - src/gallium/winsys/virgl/drm/virgl_drm_winsys.h | 2 +- src/gallium/winsys/virgl/drm/virgl_hw.h | 286 --------------------- src/gallium/winsys/virgl/vtest/Makefile.am | 1 - .../winsys/virgl/vtest/virgl_vtest_winsys.h | 2 +- 6 files changed, 2 insertions(+), 291 deletions(-) delete mode 100644 src/gallium/winsys/virgl/drm/virgl_hw.h (limited to 'src/gallium/winsys/virgl') diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am index 9c1db31c7ef..2473b88ad6e 100644 --- a/src/gallium/winsys/virgl/drm/Makefile.am +++ b/src/gallium/winsys/virgl/drm/Makefile.am @@ -25,7 +25,6 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ $(GALLIUM_WINSYS_CFLAGS) \ $(LIBDRM_CFLAGS) diff --git a/src/gallium/winsys/virgl/drm/Makefile.sources b/src/gallium/winsys/virgl/drm/Makefile.sources index eca8eb6c49f..0430d4ada4a 100644 --- a/src/gallium/winsys/virgl/drm/Makefile.sources +++ b/src/gallium/winsys/virgl/drm/Makefile.sources @@ -2,5 +2,4 @@ C_SOURCES := \ virgl_drm_public.h \ virgl_drm_winsys.c \ virgl_drm_winsys.h \ - virgl_hw.h \ virtgpu_drm.h diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h index c9b25a00977..eac1d3ed5fa 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h @@ -36,7 +36,7 @@ #include "pipe/p_context.h" #include "pipe/p_context.h" -#include "virgl_hw.h" +#include "virgl/virgl_hw.h" #include "virgl/virgl_winsys.h" struct virgl_drm_winsys; diff --git a/src/gallium/winsys/virgl/drm/virgl_hw.h b/src/gallium/winsys/virgl/drm/virgl_hw.h deleted file mode 100644 index e3c56db2ac6..00000000000 --- a/src/gallium/winsys/virgl/drm/virgl_hw.h +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright 2014, 2015 Red Hat. - * - * 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 - * on 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 - * THE AUTHOR(S) AND/OR THEIR 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 VIRGL_HW_H -#define VIRGL_HW_H - -struct virgl_box { - uint32_t x, y, z; - uint32_t w, h, d; -}; - -/* formats known by the HW device - based on gallium subset */ -enum virgl_formats { - VIRGL_FORMAT_B8G8R8A8_UNORM = 1, - VIRGL_FORMAT_B8G8R8X8_UNORM = 2, - VIRGL_FORMAT_A8R8G8B8_UNORM = 3, - VIRGL_FORMAT_X8R8G8B8_UNORM = 4, - VIRGL_FORMAT_B5G5R5A1_UNORM = 5, - VIRGL_FORMAT_B4G4R4A4_UNORM = 6, - VIRGL_FORMAT_B5G6R5_UNORM = 7, - VIRGL_FORMAT_L8_UNORM = 9, /**< ubyte luminance */ - VIRGL_FORMAT_A8_UNORM = 10, /**< ubyte alpha */ - VIRGL_FORMAT_L8A8_UNORM = 12, /**< ubyte alpha, luminance */ - VIRGL_FORMAT_L16_UNORM = 13, /**< ushort luminance */ - - VIRGL_FORMAT_Z16_UNORM = 16, - VIRGL_FORMAT_Z32_UNORM = 17, - VIRGL_FORMAT_Z32_FLOAT = 18, - VIRGL_FORMAT_Z24_UNORM_S8_UINT = 19, - VIRGL_FORMAT_S8_UINT_Z24_UNORM = 20, - VIRGL_FORMAT_Z24X8_UNORM = 21, - VIRGL_FORMAT_S8_UINT = 23, /**< ubyte stencil */ - - VIRGL_FORMAT_R32_FLOAT = 28, - VIRGL_FORMAT_R32G32_FLOAT = 29, - VIRGL_FORMAT_R32G32B32_FLOAT = 30, - VIRGL_FORMAT_R32G32B32A32_FLOAT = 31, - - VIRGL_FORMAT_R16_UNORM = 48, - VIRGL_FORMAT_R16G16_UNORM = 49, - - VIRGL_FORMAT_R16G16B16A16_UNORM = 51, - - VIRGL_FORMAT_R16_SNORM = 56, - VIRGL_FORMAT_R16G16_SNORM = 57, - VIRGL_FORMAT_R16G16B16A16_SNORM = 59, - - VIRGL_FORMAT_R8_UNORM = 64, - VIRGL_FORMAT_R8G8_UNORM = 65, - - VIRGL_FORMAT_R8G8B8A8_UNORM = 67, - - VIRGL_FORMAT_R8_SNORM = 74, - VIRGL_FORMAT_R8G8_SNORM = 75, - VIRGL_FORMAT_R8G8B8_SNORM = 76, - VIRGL_FORMAT_R8G8B8A8_SNORM = 77, - - VIRGL_FORMAT_R16_FLOAT = 91, - VIRGL_FORMAT_R16G16_FLOAT = 92, - VIRGL_FORMAT_R16G16B16_FLOAT = 93, - VIRGL_FORMAT_R16G16B16A16_FLOAT = 94, - - VIRGL_FORMAT_L8_SRGB = 95, - VIRGL_FORMAT_L8A8_SRGB = 96, - VIRGL_FORMAT_B8G8R8A8_SRGB = 100, - VIRGL_FORMAT_B8G8R8X8_SRGB = 101, - - /* compressed formats */ - VIRGL_FORMAT_DXT1_RGB = 105, - VIRGL_FORMAT_DXT1_RGBA = 106, - VIRGL_FORMAT_DXT3_RGBA = 107, - VIRGL_FORMAT_DXT5_RGBA = 108, - - /* sRGB, compressed */ - VIRGL_FORMAT_DXT1_SRGB = 109, - VIRGL_FORMAT_DXT1_SRGBA = 110, - VIRGL_FORMAT_DXT3_SRGBA = 111, - VIRGL_FORMAT_DXT5_SRGBA = 112, - - /* rgtc compressed */ - VIRGL_FORMAT_RGTC1_UNORM = 113, - VIRGL_FORMAT_RGTC1_SNORM = 114, - VIRGL_FORMAT_RGTC2_UNORM = 115, - VIRGL_FORMAT_RGTC2_SNORM = 116, - - VIRGL_FORMAT_A8B8G8R8_UNORM = 121, - VIRGL_FORMAT_B5G5R5X1_UNORM = 122, - VIRGL_FORMAT_R11G11B10_FLOAT = 124, - VIRGL_FORMAT_R9G9B9E5_FLOAT = 125, - VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT = 126, - - VIRGL_FORMAT_B10G10R10A2_UNORM = 131, - VIRGL_FORMAT_R8G8B8X8_UNORM = 134, - VIRGL_FORMAT_B4G4R4X4_UNORM = 135, - VIRGL_FORMAT_B2G3R3_UNORM = 139, - - VIRGL_FORMAT_L16A16_UNORM = 140, - VIRGL_FORMAT_A16_UNORM = 141, - - VIRGL_FORMAT_A8_SNORM = 147, - VIRGL_FORMAT_L8_SNORM = 148, - VIRGL_FORMAT_L8A8_SNORM = 149, - - VIRGL_FORMAT_A16_SNORM = 151, - VIRGL_FORMAT_L16_SNORM = 152, - VIRGL_FORMAT_L16A16_SNORM = 153, - - VIRGL_FORMAT_A16_FLOAT = 155, - VIRGL_FORMAT_L16_FLOAT = 156, - VIRGL_FORMAT_L16A16_FLOAT = 157, - - VIRGL_FORMAT_A32_FLOAT = 159, - VIRGL_FORMAT_L32_FLOAT = 160, - VIRGL_FORMAT_L32A32_FLOAT = 161, - - VIRGL_FORMAT_R8_UINT = 177, - VIRGL_FORMAT_R8G8_UINT = 178, - VIRGL_FORMAT_R8G8B8_UINT = 179, - VIRGL_FORMAT_R8G8B8A8_UINT = 180, - - VIRGL_FORMAT_R8_SINT = 181, - VIRGL_FORMAT_R8G8_SINT = 182, - VIRGL_FORMAT_R8G8B8_SINT = 183, - VIRGL_FORMAT_R8G8B8A8_SINT = 184, - - VIRGL_FORMAT_R16_UINT = 185, - VIRGL_FORMAT_R16G16_UINT = 186, - VIRGL_FORMAT_R16G16B16_UINT = 187, - VIRGL_FORMAT_R16G16B16A16_UINT = 188, - - VIRGL_FORMAT_R16_SINT = 189, - VIRGL_FORMAT_R16G16_SINT = 190, - VIRGL_FORMAT_R16G16B16_SINT = 191, - VIRGL_FORMAT_R16G16B16A16_SINT = 192, - VIRGL_FORMAT_R32_UINT = 193, - VIRGL_FORMAT_R32G32_UINT = 194, - VIRGL_FORMAT_R32G32B32_UINT = 195, - VIRGL_FORMAT_R32G32B32A32_UINT = 196, - - VIRGL_FORMAT_R32_SINT = 197, - VIRGL_FORMAT_R32G32_SINT = 198, - VIRGL_FORMAT_R32G32B32_SINT = 199, - VIRGL_FORMAT_R32G32B32A32_SINT = 200, - - VIRGL_FORMAT_A8_UINT = 201, - VIRGL_FORMAT_L8_UINT = 203, - VIRGL_FORMAT_L8A8_UINT = 204, - - VIRGL_FORMAT_A8_SINT = 205, - VIRGL_FORMAT_L8_SINT = 207, - VIRGL_FORMAT_L8A8_SINT = 208, - - VIRGL_FORMAT_A16_UINT = 209, - VIRGL_FORMAT_L16_UINT = 211, - VIRGL_FORMAT_L16A16_UINT = 212, - - VIRGL_FORMAT_A16_SINT = 213, - VIRGL_FORMAT_L16_SINT = 215, - VIRGL_FORMAT_L16A16_SINT = 216, - - VIRGL_FORMAT_A32_UINT = 217, - VIRGL_FORMAT_L32_UINT = 219, - VIRGL_FORMAT_L32A32_UINT = 220, - - VIRGL_FORMAT_A32_SINT = 221, - VIRGL_FORMAT_L32_SINT = 223, - VIRGL_FORMAT_L32A32_SINT = 224, - - VIRGL_FORMAT_B10G10R10A2_UINT = 225, - VIRGL_FORMAT_R8G8B8X8_SNORM = 229, - - VIRGL_FORMAT_R8G8B8X8_SRGB = 230, - - VIRGL_FORMAT_B10G10R10X2_UNORM = 233, - VIRGL_FORMAT_R16G16B16X16_UNORM = 234, - VIRGL_FORMAT_R16G16B16X16_SNORM = 235, - VIRGL_FORMAT_MAX, -}; - -#define VIRGL_BIND_DEPTH_STENCIL (1 << 0) -#define VIRGL_BIND_RENDER_TARGET (1 << 1) -#define VIRGL_BIND_SAMPLER_VIEW (1 << 3) -#define VIRGL_BIND_VERTEX_BUFFER (1 << 4) -#define VIRGL_BIND_INDEX_BUFFER (1 << 5) -#define VIRGL_BIND_CONSTANT_BUFFER (1 << 6) -#define VIRGL_BIND_DISPLAY_TARGET (1 << 7) -#define VIRGL_BIND_STREAM_OUTPUT (1 << 11) -#define VIRGL_BIND_CURSOR (1 << 16) -#define VIRGL_BIND_CUSTOM (1 << 17) -#define VIRGL_BIND_SCANOUT (1 << 18) - -struct virgl_caps_bool_set1 { - unsigned indep_blend_enable:1; - unsigned indep_blend_func:1; - unsigned cube_map_array:1; - unsigned shader_stencil_export:1; - unsigned conditional_render:1; - unsigned start_instance:1; - unsigned primitive_restart:1; - unsigned blend_eq_sep:1; - unsigned instanceid:1; - unsigned vertex_element_instance_divisor:1; - unsigned seamless_cube_map:1; - unsigned occlusion_query:1; - unsigned timer_query:1; - unsigned streamout_pause_resume:1; - unsigned texture_multisample:1; - unsigned fragment_coord_conventions:1; - unsigned depth_clip_disable:1; - unsigned seamless_cube_map_per_texture:1; - unsigned ubo:1; - unsigned color_clamping:1; /* not in GL 3.1 core profile */ - unsigned poly_stipple:1; /* not in GL 3.1 core profile */ - unsigned mirror_clamp:1; - unsigned texture_query_lod:1; -}; - -/* endless expansion capabilites - current gallium has 252 formats */ -struct virgl_supported_format_mask { - uint32_t bitmask[16]; -}; -/* capabilities set 2 - version 1 - 32-bit and float values */ -struct virgl_caps_v1 { - uint32_t max_version; - struct virgl_supported_format_mask sampler; - struct virgl_supported_format_mask render; - struct virgl_supported_format_mask depthstencil; - struct virgl_supported_format_mask vertexbuffer; - struct virgl_caps_bool_set1 bset; - uint32_t glsl_level; - uint32_t max_texture_array_layers; - uint32_t max_streamout_buffers; - uint32_t max_dual_source_render_targets; - uint32_t max_render_targets; - uint32_t max_samples; - uint32_t prim_mask; - uint32_t max_tbo_size; - uint32_t max_uniform_blocks; - uint32_t max_viewports; - uint32_t max_texture_gather_components; -}; - -union virgl_caps { - uint32_t max_version; - struct virgl_caps_v1 v1; -}; - -enum virgl_errors { - VIRGL_ERROR_NONE, - VIRGL_ERROR_UNKNOWN, - VIRGL_ERROR_UNKNOWN_RESOURCE_FORMAT, -}; - -enum virgl_ctx_errors { - VIRGL_ERROR_CTX_NONE, - VIRGL_ERROR_CTX_UNKNOWN, - VIRGL_ERROR_CTX_ILLEGAL_SHADER, - VIRGL_ERROR_CTX_ILLEGAL_HANDLE, - VIRGL_ERROR_CTX_ILLEGAL_RESOURCE, - VIRGL_ERROR_CTX_ILLEGAL_SURFACE, - VIRGL_ERROR_CTX_ILLEGAL_VERTEX_FORMAT, - VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER, -}; - - -#define VIRGL_RESOURCE_Y_0_TOP (1 << 0) -#endif diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am index 827b353930f..b15a3afd60c 100644 --- a/src/gallium/winsys/virgl/vtest/Makefile.am +++ b/src/gallium/winsys/virgl/vtest/Makefile.am @@ -25,7 +25,6 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers \ - -I$(top_srcdir)/src/gallium/winsys \ $(GALLIUM_WINSYS_CFLAGS) noinst_LTLIBRARIES = libvirglvtest.la diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h index 2f9dc8407ea..6d0e7b0a598 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h @@ -28,7 +28,7 @@ #include "pipe/p_defines.h" #include "pipe/p_state.h" #include "state_tracker/sw_winsys.h" -#include "virgl/drm/virgl_hw.h" +#include "virgl/virgl_hw.h" #include "virgl/virgl_winsys.h" #include "util/list.h" #include "os/os_thread.h" -- cgit v1.2.3