X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_screen.c;h=4c81022876f79358062adba8d93fab47ad7d2c9a;hb=bff60c894a290260ab3dd2086445b44622a2800e;hp=25027e197f73bf48ca692b5958a649300976b415;hpb=9e41b0badbab97c9db03d5825f91533c69e4f9f9;p=mesa.git diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 25027e197f7..4c81022876f 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -115,7 +115,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_SM3: return 1; case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: - return 0; + return 1; case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: return PIPE_MAX_SO_BUFFERS; case PIPE_CAP_ANISOTROPIC_FILTER: @@ -126,15 +126,20 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return PIPE_MAX_COLOR_BUFS; case PIPE_CAP_OCCLUSION_QUERY: return 1; - case PIPE_CAP_TIMER_QUERY: + case PIPE_CAP_QUERY_TIME_ELAPSED: + return 0; case PIPE_CAP_QUERY_TIMESTAMP: return 1; + case PIPE_CAP_QUERY_PIPELINE_STATISTICS: + return 0; case PIPE_CAP_TEXTURE_MIRROR_CLAMP: return 1; case PIPE_CAP_TEXTURE_SHADOW_MAP: return 1; case PIPE_CAP_TEXTURE_SWIZZLE: return 1; + case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: + return 0; case PIPE_CAP_MAX_TEXTURE_2D_LEVELS: return LP_MAX_TEXTURE_2D_LEVELS; case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: @@ -151,16 +156,14 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT: case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER: + case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER: return 1; case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT: - case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER: return 0; case PIPE_CAP_PRIMITIVE_RESTART: return 1; - case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE: - return 1; case PIPE_CAP_DEPTH_CLIP_DISABLE: - return 0; + return 1; case PIPE_CAP_SHADER_STENCIL_EXPORT: return 0; case PIPE_CAP_TGSI_INSTANCEID: @@ -172,7 +175,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_SEAMLESS_CUBE_MAP: case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: - return 0; + return 1; case PIPE_CAP_SCALED_RESOLVE: return 0; /* this is a lie could support arbitrary large offsets */ @@ -189,14 +192,13 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) return 16*4; case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: return 1; - case PIPE_CAP_TGSI_CAN_COMPACT_VARYINGS: case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: return 0; case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: case PIPE_CAP_VERTEX_COLOR_CLAMPED: return 1; case PIPE_CAP_GLSL_FEATURE_LEVEL: - return 120; + return 140; case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: return 0; case PIPE_CAP_COMPUTE: @@ -209,6 +211,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY: case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: + case PIPE_CAP_TGSI_TEXCOORD: return 0; case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: @@ -217,8 +220,19 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_TEXTURE_MULTISAMPLE: case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: case PIPE_CAP_CUBE_MAP_ARRAY: + return 0; case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: + return 1; + case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: + return 65536; + case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: + return 1; + case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: return 0; + case PIPE_CAP_MAX_VIEWPORTS: + return PIPE_MAX_VIEWPORTS; + case PIPE_CAP_ENDIANNESS: + return PIPE_ENDIAN_NATIVE; } /* should only get here on unhandled cases */ debug_printf("Unexpected PIPE_CAP %d query\n", param); @@ -303,10 +317,6 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, if (!format_desc) return FALSE; - /* Z16 support is missing, which breaks the blit */ - if (format == PIPE_FORMAT_Z16_UNORM) - return FALSE; - assert(target == PIPE_BUFFER || target == PIPE_TEXTURE_1D || target == PIPE_TEXTURE_1D_ARRAY || @@ -320,19 +330,40 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, return FALSE; if (bind & PIPE_BIND_RENDER_TARGET) { - if (format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB) + if (format_desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) { + if (format_desc->nr_channels < 3) + return FALSE; + } + else if (format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB) return FALSE; - if (format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) + if (format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN && + format != PIPE_FORMAT_R11G11B10_FLOAT) return FALSE; + assert(format_desc->block.width == 1); assert(format_desc->block.height == 1); if (format_desc->is_mixed) return FALSE; - if (!format_desc->is_array && !format_desc->is_bitmask) + if (!format_desc->is_array && !format_desc->is_bitmask && + format != PIPE_FORMAT_R11G11B10_FLOAT) return FALSE; + + /* + * XXX refuse formats known to crash in generate_unswizzled_blend(). + * These include all 3-channel 24bit RGB8 variants, plus 48bit + * (except those using floats) 3-channel RGB16 variants (the latter + * seems to be more of a llvm bug though). + * The mesa state tracker only seems to use these for SINT/UINT formats. + */ + if (format_desc->is_array && format_desc->nr_channels == 3) { + if (format_desc->block.bits == 24 || (format_desc->block.bits == 48 && + !util_format_is_float(format))) { + return FALSE; + } + } } if (bind & PIPE_BIND_DISPLAY_TARGET) { @@ -347,9 +378,10 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, if (format_desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS) return FALSE; - /* FIXME: Temporary restriction. See lp_state_fs.c. */ - if (format_desc->block.bits != 32) + /* TODO: Support stencil-only formats */ + if (format_desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_NONE) { return FALSE; + } } if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) { @@ -357,14 +389,10 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, } /* - * Everything can be supported by u_format. + * Everything can be supported by u_format + * (those without fetch_rgba_float might be not but shouldn't hit that) */ - if (format_desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS && - !format_desc->fetch_rgba_float) { - return FALSE; - } - return TRUE; } @@ -465,9 +493,10 @@ llvmpipe_create_screen(struct sw_winsys *winsys) { struct llvmpipe_screen *screen; -#ifdef PIPE_ARCH_X86 - /* require SSE2 due to LLVM PR6960. */ util_cpu_detect(); + +#if defined(PIPE_ARCH_X86) && HAVE_LLVM < 0x0302 + /* require SSE2 due to LLVM PR6960. */ if (!util_cpu_caps.has_sse2) return NULL; #endif