X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_screen.c;h=bc914b7af7fe23ca2f4595b740d6cf9a105aae50;hb=9ced3fc649ec04710a5f5c855bfb582b898cff83;hp=f37d1724657478308bcc09ebbe9957e24921409d;hpb=4552fd50d959ab99546cfa994f8ba5bdf5d66bc7;p=mesa.git diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index f37d1724657..bc914b7af7f 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -23,6 +23,7 @@ * **********************************************************/ +#include "util/u_format.h" #include "util/u_memory.h" #include "util/u_inlines.h" #include "util/u_string.h" @@ -102,9 +103,9 @@ svga_get_paramf(struct pipe_screen *screen, enum pipe_capf param) switch (param) { case PIPE_CAPF_MAX_LINE_WIDTH: - /* fall-through */ + return svgascreen->maxLineWidth; case PIPE_CAPF_MAX_LINE_WIDTH_AA: - return 7.0; + return svgascreen->maxLineWidthAA; case PIPE_CAPF_MAX_POINT_WIDTH: /* fall-through */ @@ -113,16 +114,20 @@ svga_get_paramf(struct pipe_screen *screen, enum pipe_capf param) case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY: if(!sws->get_cap(sws, SVGA3D_DEVCAP_MAX_TEXTURE_ANISOTROPY, &result)) - return 4.0; - return result.u; + return 4.0f; + return (float) result.u; case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS: return 15.0; - - default: - debug_printf("Unexpected PIPE_CAPF_ query %u\n", param); - return 0; + case PIPE_CAPF_GUARD_BAND_LEFT: + case PIPE_CAPF_GUARD_BAND_TOP: + case PIPE_CAPF_GUARD_BAND_RIGHT: + case PIPE_CAPF_GUARD_BAND_BOTTOM: + return 0.0; } + + debug_printf("Unexpected PIPE_CAPF_ query %u\n", param); + return 0; } @@ -134,9 +139,8 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) SVGA3dDevCapResult result; switch (param) { - case PIPE_CAP_MAX_COMBINED_SAMPLERS: - return 16; case PIPE_CAP_NPOT_TEXTURES: + case PIPE_CAP_MIXED_FRAMEBUFFER_SIZES: return 1; case PIPE_CAP_TWO_SIDED_STENCIL: return 1; @@ -146,23 +150,23 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_POINT_SPRITE: return 1; + case PIPE_CAP_TGSI_TEXCOORD: + return 0; case PIPE_CAP_MAX_RENDER_TARGETS: - if(!sws->get_cap(sws, SVGA3D_DEVCAP_MAX_RENDER_TARGETS, &result)) - return 1; - if(!result.u) - return 1; - return MIN2(result.u, PIPE_MAX_COLOR_BUFS); + return svgascreen->max_color_buffers; case PIPE_CAP_OCCLUSION_QUERY: return 1; - case PIPE_CAP_TIMER_QUERY: + case PIPE_CAP_QUERY_TIME_ELAPSED: return 0; case PIPE_CAP_TEXTURE_SHADOW_MAP: return 1; case PIPE_CAP_TEXTURE_SWIZZLE: return 1; - case PIPE_CAP_USER_VERTEX_BUFFERS: + case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: return 0; + case PIPE_CAP_USER_VERTEX_BUFFERS: case PIPE_CAP_USER_INDEX_BUFFERS: + return 0; case PIPE_CAP_USER_CONSTANT_BUFFERS: return 1; case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: @@ -199,13 +203,12 @@ svga_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_HALF_INTEGER: return 1; + case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER: + return 0; case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT: - case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER: return 0; - - case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE: + case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER: return 1; case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: @@ -215,11 +218,21 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: return 0; /* The driver can't clamp fragment colors */ - /* Unsupported features */ case PIPE_CAP_MIXED_COLORBUFFER_FORMATS: + return 1; /* expected for GL_ARB_framebuffer_object */ + + case PIPE_CAP_GLSL_FEATURE_LEVEL: + return 120; + + case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: + return 0; + + case PIPE_CAP_SM3: + return 1; + + /* Unsupported features */ case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: case PIPE_CAP_TEXTURE_MIRROR_CLAMP: - case PIPE_CAP_SM3: case PIPE_CAP_SHADER_STENCIL_EXPORT: case PIPE_CAP_DEPTH_CLIP_DISABLE: case PIPE_CAP_SEAMLESS_CUBE_MAP: @@ -233,20 +246,47 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: case PIPE_CAP_MIN_TEXEL_OFFSET: case PIPE_CAP_MAX_TEXEL_OFFSET: + case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET: + case PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET: case PIPE_CAP_CONDITIONAL_RENDER: case PIPE_CAP_TEXTURE_BARRIER: case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: - case PIPE_CAP_TGSI_CAN_COMPACT_VARYINGS: + case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES: + case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS: case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: - case PIPE_CAP_GLSL_FEATURE_LEVEL: - return 0; - - default: - debug_printf("Unexpected PIPE_CAP_ query %u\n", param); + case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY: + case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: + case PIPE_CAP_COMPUTE: + case PIPE_CAP_START_INSTANCE: + case PIPE_CAP_QUERY_TIMESTAMP: + case PIPE_CAP_TEXTURE_MULTISAMPLE: + case PIPE_CAP_CUBE_MAP_ARRAY: + case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: + case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: + case PIPE_CAP_QUERY_PIPELINE_STATISTICS: + case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: + case PIPE_CAP_TGSI_VS_LAYER: + case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS: + case PIPE_CAP_TEXTURE_GATHER_SM5: + case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT: + case PIPE_CAP_FAKE_SW_MSAA: + case PIPE_CAP_TEXTURE_QUERY_LOD: + case PIPE_CAP_SAMPLE_SHADING: return 0; + case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: + return 64; + case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: + return 1; + case PIPE_CAP_MAX_VIEWPORTS: + return 1; + case PIPE_CAP_ENDIANNESS: + return PIPE_ENDIAN_LITTLE; } + + debug_printf("Unexpected PIPE_CAP_ query %u\n", param); + return 0; } static int svga_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap param) @@ -289,7 +329,9 @@ static int svga_get_shader_param(struct pipe_screen *screen, unsigned shader, en case PIPE_SHADER_CAP_MAX_PREDS: return 1; case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED: - return 1; + return 0; + case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED: + return 0; case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR: case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR: case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR: @@ -299,12 +341,14 @@ static int svga_get_shader_param(struct pipe_screen *screen, unsigned shader, en case PIPE_SHADER_CAP_INTEGERS: return 0; case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: + case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS: return 16; - default: - debug_printf("Unexpected vertex shader query %u\n", param); - return 0; + case PIPE_SHADER_CAP_PREFERRED_IR: + return PIPE_SHADER_IR_TGSI; } - break; + /* If we get here, we failed to handle a cap above */ + debug_printf("Unexpected fragment shader query %u\n", param); + return 0; case PIPE_SHADER_VERTEX: switch (param) { @@ -334,7 +378,9 @@ static int svga_get_shader_param(struct pipe_screen *screen, unsigned shader, en case PIPE_SHADER_CAP_MAX_PREDS: return 1; case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED: - return 1; + return 0; + case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED: + return 0; case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR: case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR: return 1; @@ -347,42 +393,49 @@ static int svga_get_shader_param(struct pipe_screen *screen, unsigned shader, en case PIPE_SHADER_CAP_INTEGERS: return 0; case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: + case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS: return 0; - default: - debug_printf("Unexpected vertex shader query %u\n", param); - return 0; + case PIPE_SHADER_CAP_PREFERRED_IR: + return PIPE_SHADER_IR_TGSI; } - break; + /* If we get here, we failed to handle a cap above */ + debug_printf("Unexpected vertex shader query %u\n", param); + return 0; case PIPE_SHADER_GEOMETRY: - /* no support for geometry shaders at this time */ + case PIPE_SHADER_COMPUTE: + /* no support for geometry or compute shaders at this time */ return 0; default: - debug_printf("Unexpected vertex shader query %u\n", param); + debug_printf("Unexpected shader type (%u) query\n", shader); return 0; } return 0; } +/** + * Implemnt pipe_screen::is_format_supported(). + * \param bindings bitmask of PIPE_BIND_x flags + */ static boolean svga_is_format_supported( struct pipe_screen *screen, enum pipe_format format, enum pipe_texture_target target, unsigned sample_count, - unsigned tex_usage) + unsigned bindings) { struct svga_screen *ss = svga_screen(screen); SVGA3dSurfaceFormat svga_format; SVGA3dSurfaceFormatCaps caps; SVGA3dSurfaceFormatCaps mask; - assert(tex_usage); + assert(bindings); if (sample_count > 1) { return FALSE; } - svga_format = svga_translate_format(ss, format, tex_usage); + svga_format = svga_translate_format(ss, format, bindings); if (svga_format == SVGA3D_FORMAT_INVALID) { return FALSE; } @@ -392,7 +445,7 @@ svga_is_format_supported( struct pipe_screen *screen, * visuals for all virtual hardware implementations. */ - if (tex_usage & PIPE_BIND_DISPLAY_TARGET) { + if (bindings & PIPE_BIND_DISPLAY_TARGET) { switch (svga_format) { case SVGA3D_A8R8G8B8: case SVGA3D_X8R8G8B8: @@ -418,16 +471,23 @@ svga_is_format_supported( struct pipe_screen *screen, svga_get_format_cap(ss, svga_format, &caps); mask.value = 0; - if (tex_usage & PIPE_BIND_RENDER_TARGET) { + if (bindings & PIPE_BIND_RENDER_TARGET) { mask.offscreenRenderTarget = 1; } - if (tex_usage & PIPE_BIND_DEPTH_STENCIL) { + if (bindings & PIPE_BIND_DEPTH_STENCIL) { mask.zStencil = 1; } - if (tex_usage & PIPE_BIND_SAMPLER_VIEW) { + if (bindings & PIPE_BIND_SAMPLER_VIEW) { mask.texture = 1; } + if (target == PIPE_TEXTURE_CUBE) { + mask.cubeTexture = 1; + } + if (target == PIPE_TEXTURE_3D) { + mask.volumeTexture = 1; + } + return (caps.value & mask.value) == mask.value; } @@ -465,6 +525,28 @@ svga_fence_finish(struct pipe_screen *screen, } +static int +svga_get_driver_query_info(struct pipe_screen *screen, + unsigned index, + struct pipe_driver_query_info *info) +{ + static const struct pipe_driver_query_info queries[] = { + {"draw-calls", SVGA_QUERY_DRAW_CALLS, 0, FALSE}, + {"fallbacks", SVGA_QUERY_FALLBACKS, 0, FALSE}, + {"memory-used", SVGA_QUERY_MEMORY_USED, 0, TRUE} + }; + + if (!info) + return Elements(queries); + + if (index >= Elements(queries)) + return 0; + + *info = queries[index]; + return 1; +} + + static void svga_destroy_screen( struct pipe_screen *screen ) { @@ -524,6 +606,7 @@ svga_screen_create(struct svga_winsys_screen *sws) screen->fence_reference = svga_fence_reference; screen->fence_signalled = svga_fence_signalled; screen->fence_finish = svga_fence_finish; + screen->get_driver_query_info = svga_get_driver_query_info; svgascreen->sws = sws; svga_init_screen_resource_functions(svgascreen); @@ -591,6 +674,34 @@ svga_screen_create(struct svga_winsys_screen *sws) } } + /* Query device caps + */ + if (!sws->get_cap(sws, SVGA3D_DEVCAP_LINE_STIPPLE, &result)) + svgascreen->haveLineStipple = FALSE; + else + svgascreen->haveLineStipple = result.u; + + if (!sws->get_cap(sws, SVGA3D_DEVCAP_LINE_AA, &result)) + svgascreen->haveLineSmooth = FALSE; + else + svgascreen->haveLineSmooth = result.u; + + if (!sws->get_cap(sws, SVGA3D_DEVCAP_MAX_LINE_WIDTH, &result)) + svgascreen->maxLineWidth = 1.0F; + else + svgascreen->maxLineWidth = result.f; + + if (!sws->get_cap(sws, SVGA3D_DEVCAP_MAX_AA_LINE_WIDTH, &result)) + svgascreen->maxLineWidthAA = 1.0F; + else + svgascreen->maxLineWidthAA = result.f; + + if (0) + debug_printf("svga: haveLineStip %u " + "haveLineSmooth %u maxLineWidth %f\n", + svgascreen->haveLineStipple, svgascreen->haveLineSmooth, + svgascreen->maxLineWidth); + if (!sws->get_cap(sws, SVGA3D_DEVCAP_MAX_POINT_SIZE, &result)) { svgascreen->maxPointSize = 1.0F; } else { @@ -600,6 +711,11 @@ svga_screen_create(struct svga_winsys_screen *sws) svgascreen->maxPointSize = MIN2(result.f, 80.0f); } + /* The SVGA3D device always supports 4 targets at this time, regardless + * of what querying SVGA3D_DEVCAP_MAX_RENDER_TARGETS might return. + */ + svgascreen->max_color_buffers = 4; + pipe_mutex_init(svgascreen->tex_mutex); pipe_mutex_init(svgascreen->swc_mutex);