From: Brian Paul Date: Wed, 10 Jun 2015 16:59:37 +0000 (-0600) Subject: gallium: remove explicit values from PIPE_CAP_ enums X-Git-Tag: upstream/17.1.0~18351 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a6e4f46ed117b393e26aff326e5b05d4aea7fb0;p=platform%2Fupstream%2Fmesa.git gallium: remove explicit values from PIPE_CAP_ enums The other PIPE_CAPF_ and PIPE_SHADER_CAP_ enums don't have explicit values. Reviewed-by: Roland Scheidegger Reviewed-by: Jose Fonseca --- diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index a077029..88b7b76 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -505,106 +505,106 @@ enum pipe_reset_status */ enum pipe_cap { - PIPE_CAP_NPOT_TEXTURES = 1, - PIPE_CAP_TWO_SIDED_STENCIL = 2, - PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS = 4, - PIPE_CAP_ANISOTROPIC_FILTER = 5, - PIPE_CAP_POINT_SPRITE = 6, - PIPE_CAP_MAX_RENDER_TARGETS = 7, - PIPE_CAP_OCCLUSION_QUERY = 8, - PIPE_CAP_QUERY_TIME_ELAPSED = 9, - PIPE_CAP_TEXTURE_SHADOW_MAP = 10, - PIPE_CAP_TEXTURE_SWIZZLE = 11, - PIPE_CAP_MAX_TEXTURE_2D_LEVELS = 12, - PIPE_CAP_MAX_TEXTURE_3D_LEVELS = 13, - PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS = 14, - PIPE_CAP_TEXTURE_MIRROR_CLAMP = 25, - PIPE_CAP_BLEND_EQUATION_SEPARATE = 28, - PIPE_CAP_SM3 = 29, /*< Shader Model, supported */ - PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS = 30, - PIPE_CAP_PRIMITIVE_RESTART = 31, + PIPE_CAP_NPOT_TEXTURES, + PIPE_CAP_TWO_SIDED_STENCIL, + PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS, + PIPE_CAP_ANISOTROPIC_FILTER, + PIPE_CAP_POINT_SPRITE, + PIPE_CAP_MAX_RENDER_TARGETS, + PIPE_CAP_OCCLUSION_QUERY, + PIPE_CAP_QUERY_TIME_ELAPSED, + PIPE_CAP_TEXTURE_SHADOW_MAP, + PIPE_CAP_TEXTURE_SWIZZLE, + PIPE_CAP_MAX_TEXTURE_2D_LEVELS, + PIPE_CAP_MAX_TEXTURE_3D_LEVELS, + PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS, + PIPE_CAP_TEXTURE_MIRROR_CLAMP, + PIPE_CAP_BLEND_EQUATION_SEPARATE, + PIPE_CAP_SM3, + PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS, + PIPE_CAP_PRIMITIVE_RESTART, /** blend enables and write masks per rendertarget */ - PIPE_CAP_INDEP_BLEND_ENABLE = 33, + PIPE_CAP_INDEP_BLEND_ENABLE, /** different blend funcs per rendertarget */ - PIPE_CAP_INDEP_BLEND_FUNC = 34, - PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS = 36, - PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT = 37, - PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT = 38, - PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER = 39, - PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER = 40, - PIPE_CAP_DEPTH_CLIP_DISABLE = 41, - PIPE_CAP_SHADER_STENCIL_EXPORT = 42, - PIPE_CAP_TGSI_INSTANCEID = 43, - PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR = 44, - PIPE_CAP_FRAGMENT_COLOR_CLAMPED = 45, - PIPE_CAP_MIXED_COLORBUFFER_FORMATS = 46, - PIPE_CAP_SEAMLESS_CUBE_MAP = 47, - PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE = 48, - PIPE_CAP_MIN_TEXEL_OFFSET = 50, - PIPE_CAP_MAX_TEXEL_OFFSET = 51, - PIPE_CAP_CONDITIONAL_RENDER = 52, - PIPE_CAP_TEXTURE_BARRIER = 53, - PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS = 55, - PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS = 56, - PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME = 57, - PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS = 59, /* temporary */ - PIPE_CAP_VERTEX_COLOR_UNCLAMPED = 60, - PIPE_CAP_VERTEX_COLOR_CLAMPED = 61, - PIPE_CAP_GLSL_FEATURE_LEVEL = 62, - PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION = 63, - PIPE_CAP_USER_VERTEX_BUFFERS = 64, - PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY = 65, - PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY = 66, - PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY = 67, - PIPE_CAP_COMPUTE = 68, - PIPE_CAP_USER_INDEX_BUFFERS = 69, - PIPE_CAP_USER_CONSTANT_BUFFERS = 70, - PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT = 71, - PIPE_CAP_START_INSTANCE = 72, - PIPE_CAP_QUERY_TIMESTAMP = 73, - PIPE_CAP_TEXTURE_MULTISAMPLE = 74, - PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT = 75, - PIPE_CAP_CUBE_MAP_ARRAY = 76, - PIPE_CAP_TEXTURE_BUFFER_OBJECTS = 77, - PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT = 78, - PIPE_CAP_TGSI_TEXCOORD = 79, - PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER = 80, - PIPE_CAP_QUERY_PIPELINE_STATISTICS = 81, - PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK = 82, - PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE = 83, - PIPE_CAP_MAX_VIEWPORTS = 84, - PIPE_CAP_ENDIANNESS = 85, - PIPE_CAP_MIXED_FRAMEBUFFER_SIZES = 86, - PIPE_CAP_TGSI_VS_LAYER_VIEWPORT = 87, - PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES = 88, - PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 89, - PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS = 90, - PIPE_CAP_TEXTURE_GATHER_SM5 = 91, - PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT = 92, - PIPE_CAP_FAKE_SW_MSAA = 93, - PIPE_CAP_TEXTURE_QUERY_LOD = 94, - PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET = 95, - PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET = 96, - PIPE_CAP_SAMPLE_SHADING = 97, - PIPE_CAP_TEXTURE_GATHER_OFFSETS = 98, - PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION = 99, - PIPE_CAP_MAX_VERTEX_STREAMS = 100, - PIPE_CAP_DRAW_INDIRECT = 101, - PIPE_CAP_TGSI_FS_FINE_DERIVATIVE = 102, - PIPE_CAP_VENDOR_ID = 103, - PIPE_CAP_DEVICE_ID = 104, - PIPE_CAP_ACCELERATED = 105, - PIPE_CAP_VIDEO_MEMORY = 106, - PIPE_CAP_UMA = 107, - PIPE_CAP_CONDITIONAL_RENDER_INVERTED = 108, - PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE = 109, - PIPE_CAP_SAMPLER_VIEW_TARGET = 110, - PIPE_CAP_CLIP_HALFZ = 111, - PIPE_CAP_VERTEXID_NOBASE = 112, - PIPE_CAP_POLYGON_OFFSET_CLAMP = 113, - PIPE_CAP_MULTISAMPLE_Z_RESOLVE = 114, - PIPE_CAP_RESOURCE_FROM_USER_MEMORY = 115, - PIPE_CAP_DEVICE_RESET_STATUS_QUERY = 116, + PIPE_CAP_INDEP_BLEND_FUNC, + PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS, + PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT, + PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT, + PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER, + PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER, + PIPE_CAP_DEPTH_CLIP_DISABLE, + PIPE_CAP_SHADER_STENCIL_EXPORT, + PIPE_CAP_TGSI_INSTANCEID, + PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR, + PIPE_CAP_FRAGMENT_COLOR_CLAMPED, + PIPE_CAP_MIXED_COLORBUFFER_FORMATS, + PIPE_CAP_SEAMLESS_CUBE_MAP, + PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE, + PIPE_CAP_MIN_TEXEL_OFFSET, + PIPE_CAP_MAX_TEXEL_OFFSET, + PIPE_CAP_CONDITIONAL_RENDER, + PIPE_CAP_TEXTURE_BARRIER, + PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS, + PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS, + PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME, + PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS, + PIPE_CAP_VERTEX_COLOR_UNCLAMPED, + PIPE_CAP_VERTEX_COLOR_CLAMPED, + PIPE_CAP_GLSL_FEATURE_LEVEL, + PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION, + PIPE_CAP_USER_VERTEX_BUFFERS, + PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY, + PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY, + PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY, + PIPE_CAP_COMPUTE, + PIPE_CAP_USER_INDEX_BUFFERS, + PIPE_CAP_USER_CONSTANT_BUFFERS, + PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT, + PIPE_CAP_START_INSTANCE, + PIPE_CAP_QUERY_TIMESTAMP, + PIPE_CAP_TEXTURE_MULTISAMPLE, + PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT, + PIPE_CAP_CUBE_MAP_ARRAY, + PIPE_CAP_TEXTURE_BUFFER_OBJECTS, + PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT, + PIPE_CAP_TGSI_TEXCOORD, + PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER, + PIPE_CAP_QUERY_PIPELINE_STATISTICS, + PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK, + PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE, + PIPE_CAP_MAX_VIEWPORTS, + PIPE_CAP_ENDIANNESS, + PIPE_CAP_MIXED_FRAMEBUFFER_SIZES, + PIPE_CAP_TGSI_VS_LAYER_VIEWPORT, + PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES, + PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, + PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS, + PIPE_CAP_TEXTURE_GATHER_SM5, + PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT, + PIPE_CAP_FAKE_SW_MSAA, + PIPE_CAP_TEXTURE_QUERY_LOD, + PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET, + PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET, + PIPE_CAP_SAMPLE_SHADING, + PIPE_CAP_TEXTURE_GATHER_OFFSETS, + PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION, + PIPE_CAP_MAX_VERTEX_STREAMS, + PIPE_CAP_DRAW_INDIRECT, + PIPE_CAP_TGSI_FS_FINE_DERIVATIVE, + PIPE_CAP_VENDOR_ID, + PIPE_CAP_DEVICE_ID, + PIPE_CAP_ACCELERATED, + PIPE_CAP_VIDEO_MEMORY, + PIPE_CAP_UMA, + PIPE_CAP_CONDITIONAL_RENDER_INVERTED, + PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE, + PIPE_CAP_SAMPLER_VIEW_TARGET, + PIPE_CAP_CLIP_HALFZ, + PIPE_CAP_VERTEXID_NOBASE, + PIPE_CAP_POLYGON_OFFSET_CLAMP, + PIPE_CAP_MULTISAMPLE_Z_RESOLVE, + PIPE_CAP_RESOURCE_FROM_USER_MEMORY, + PIPE_CAP_DEVICE_RESET_STATUS_QUERY, }; #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)