From 55c05b8a12944349b00053253d3a49b223a9f4de Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Sep 2013 11:47:27 +0200 Subject: fontconfig mesa pixman git update 20 Sep 2013 pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1 mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7 --- mesalib/src/gallium/auxiliary/util/u_blit.c | 477 ++++--------------------- mesalib/src/gallium/auxiliary/util/u_blit.h | 1 + mesalib/src/glsl/Android.gen.mk | 19 - mesalib/src/glsl/builtin_functions.cpp | 3 + mesalib/src/glsl/standalone_scaffolding.cpp | 2 + mesalib/src/mesa/main/context.c | 6 + mesalib/src/mesa/main/get.c | 13 +- mesalib/src/mesa/main/get_hash_params.py | 19 +- mesalib/src/mesa/main/mtypes.h | 25 +- mesalib/src/mesa/state_tracker/st_extensions.c | 5 +- 10 files changed, 127 insertions(+), 443 deletions(-) (limited to 'mesalib/src') diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.c b/mesalib/src/gallium/auxiliary/util/u_blit.c index 8cc080cc9..4ba71b929 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blit.c +++ b/mesalib/src/gallium/auxiliary/util/u_blit.c @@ -46,6 +46,7 @@ #include "util/u_math.h" #include "util/u_memory.h" #include "util/u_sampler.h" +#include "util/u_texture.h" #include "util/u_simple_shaders.h" #include "cso_cache/cso_context.h" @@ -56,29 +57,20 @@ struct blit_state struct pipe_context *pipe; struct cso_context *cso; - struct pipe_blend_state blend_write_color, blend_keep_color; + struct pipe_blend_state blend_write_color; struct pipe_depth_stencil_alpha_state dsa_keep_depthstencil; - struct pipe_depth_stencil_alpha_state dsa_write_depthstencil; - struct pipe_depth_stencil_alpha_state dsa_write_depth; - struct pipe_depth_stencil_alpha_state dsa_write_stencil; struct pipe_rasterizer_state rasterizer; struct pipe_sampler_state sampler; struct pipe_viewport_state viewport; struct pipe_vertex_element velem[2]; - enum pipe_texture_target internal_target; void *vs; void *fs[PIPE_MAX_TEXTURE_TYPES][TGSI_WRITEMASK_XYZW + 1]; - void *fs_depthstencil[PIPE_MAX_TEXTURE_TYPES]; - void *fs_depth[PIPE_MAX_TEXTURE_TYPES]; - void *fs_stencil[PIPE_MAX_TEXTURE_TYPES]; struct pipe_resource *vbuf; /**< quad vertices */ unsigned vbuf_slot; float vertices[4][2][4]; /**< vertex/texcoords for quad */ - - boolean has_stencil_export; }; @@ -102,20 +94,6 @@ util_create_blit(struct pipe_context *pipe, struct cso_context *cso) /* disabled blending/masking */ ctx->blend_write_color.rt[0].colormask = PIPE_MASK_RGBA; - /* depth stencil states */ - ctx->dsa_write_depth.depth.enabled = 1; - ctx->dsa_write_depth.depth.writemask = 1; - ctx->dsa_write_depth.depth.func = PIPE_FUNC_ALWAYS; - ctx->dsa_write_stencil.stencil[0].enabled = 1; - ctx->dsa_write_stencil.stencil[0].func = PIPE_FUNC_ALWAYS; - ctx->dsa_write_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE; - ctx->dsa_write_stencil.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE; - ctx->dsa_write_stencil.stencil[0].zfail_op = PIPE_STENCIL_OP_REPLACE; - ctx->dsa_write_stencil.stencil[0].valuemask = 0xff; - ctx->dsa_write_stencil.stencil[0].writemask = 0xff; - ctx->dsa_write_depthstencil.depth = ctx->dsa_write_depth.depth; - ctx->dsa_write_depthstencil.stencil[0] = ctx->dsa_write_stencil.stencil[0]; - /* rasterizer */ ctx->rasterizer.cull_face = PIPE_FACE_NONE; ctx->rasterizer.half_pixel_center = 1; @@ -143,18 +121,9 @@ util_create_blit(struct pipe_context *pipe, struct cso_context *cso) /* init vertex data that doesn't change */ for (i = 0; i < 4; i++) { ctx->vertices[i][0][3] = 1.0f; /* w */ - ctx->vertices[i][1][2] = 0.0f; /* r */ ctx->vertices[i][1][3] = 1.0f; /* q */ } - if(pipe->screen->get_param(pipe->screen, PIPE_CAP_NPOT_TEXTURES)) - ctx->internal_target = PIPE_TEXTURE_2D; - else - ctx->internal_target = PIPE_TEXTURE_RECT; - - ctx->has_stencil_export = - pipe->screen->get_param(pipe->screen, PIPE_CAP_SHADER_STENCIL_EXPORT); - return ctx; } @@ -178,18 +147,6 @@ util_destroy_blit(struct blit_state *ctx) } } - for (i = 0; i < PIPE_MAX_TEXTURE_TYPES; i++) { - if (ctx->fs_depthstencil[i]) { - pipe->delete_fs_state(pipe, ctx->fs_depthstencil[i]); - } - if (ctx->fs_depth[i]) { - pipe->delete_fs_state(pipe, ctx->fs_depth[i]); - } - if (ctx->fs_stencil[i]) { - pipe->delete_fs_state(pipe, ctx->fs_stencil[i]); - } - } - pipe_resource_reference(&ctx->vbuf, NULL); FREE(ctx); @@ -216,63 +173,6 @@ set_fragment_shader(struct blit_state *ctx, uint writemask, } -/** - * Helper function to set the shader which writes depth and stencil. - */ -static INLINE void -set_depthstencil_fragment_shader(struct blit_state *ctx, - enum pipe_texture_target pipe_tex) -{ - if (!ctx->fs_depthstencil[pipe_tex]) { - unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0); - - ctx->fs_depthstencil[pipe_tex] = - util_make_fragment_tex_shader_writedepthstencil(ctx->pipe, tgsi_tex, - TGSI_INTERPOLATE_LINEAR); - } - - cso_set_fragment_shader_handle(ctx->cso, ctx->fs_depthstencil[pipe_tex]); -} - - -/** - * Helper function to set the shader which writes depth. - */ -static INLINE void -set_depth_fragment_shader(struct blit_state *ctx, - enum pipe_texture_target pipe_tex) -{ - if (!ctx->fs_depth[pipe_tex]) { - unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0); - - ctx->fs_depth[pipe_tex] = - util_make_fragment_tex_shader_writedepth(ctx->pipe, tgsi_tex, - TGSI_INTERPOLATE_LINEAR); - } - - cso_set_fragment_shader_handle(ctx->cso, ctx->fs_depth[pipe_tex]); -} - - -/** - * Helper function to set the shader which writes stencil. - */ -static INLINE void -set_stencil_fragment_shader(struct blit_state *ctx, - enum pipe_texture_target pipe_tex) -{ - if (!ctx->fs_stencil[pipe_tex]) { - unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex, 0); - - ctx->fs_stencil[pipe_tex] = - util_make_fragment_tex_shader_writestencil(ctx->pipe, tgsi_tex, - TGSI_INTERPOLATE_LINEAR); - } - - cso_set_fragment_shader_handle(ctx->cso, ctx->fs_stencil[pipe_tex]); -} - - /** * Helper function to set the vertex shader. */ @@ -324,9 +224,14 @@ get_next_slot( struct blit_state *ctx ) /** * Setup vertex data for the textured quad we'll draw. * Note: y=0=top + * + * FIXME: We should call util_map_texcoords2d_onto_cubemap + * for cubemaps. */ static unsigned setup_vertex_data_tex(struct blit_state *ctx, + unsigned src_target, + unsigned src_face, float x0, float y0, float x1, float y1, float s0, float t0, float s1, float t1, float z) @@ -338,24 +243,37 @@ setup_vertex_data_tex(struct blit_state *ctx, ctx->vertices[0][0][2] = z; ctx->vertices[0][1][0] = s0; /*s*/ ctx->vertices[0][1][1] = t0; /*t*/ + ctx->vertices[0][1][2] = 0; /*r*/ ctx->vertices[1][0][0] = x1; ctx->vertices[1][0][1] = y0; ctx->vertices[1][0][2] = z; ctx->vertices[1][1][0] = s1; /*s*/ ctx->vertices[1][1][1] = t0; /*t*/ + ctx->vertices[1][1][2] = 0; /*r*/ ctx->vertices[2][0][0] = x1; ctx->vertices[2][0][1] = y1; ctx->vertices[2][0][2] = z; ctx->vertices[2][1][0] = s1; ctx->vertices[2][1][1] = t1; + ctx->vertices[3][1][2] = 0; ctx->vertices[3][0][0] = x0; ctx->vertices[3][0][1] = y1; ctx->vertices[3][0][2] = z; ctx->vertices[3][1][0] = s0; ctx->vertices[3][1][1] = t1; + ctx->vertices[3][1][2] = 0; + + if (src_target == PIPE_TEXTURE_CUBE || + src_target == PIPE_TEXTURE_CUBE_ARRAY) { + /* Map cubemap texture coordinates inplace. */ + const unsigned stride = sizeof ctx->vertices[0] / sizeof ctx->vertices[0][0][0]; + util_map_texcoords2d_onto_cubemap(src_face, + &ctx->vertices[0][1][0], stride, + &ctx->vertices[0][1][0], stride); + } offset = get_next_slot( ctx ); @@ -436,21 +354,14 @@ util_blit_pixels(struct blit_state *ctx, uint writemask, uint zs_writemask) { struct pipe_context *pipe = ctx->pipe; - struct pipe_screen *screen = pipe->screen; enum pipe_format src_format, dst_format; - struct pipe_sampler_view *sampler_view = NULL; - struct pipe_sampler_view sv_templ; - struct pipe_surface *dst_surface; - struct pipe_framebuffer_state fb; const int srcW = abs(srcX1 - srcX0); const int srcH = abs(srcY1 - srcY0); - unsigned offset; boolean overlap; - float s0, t0, s1, t1; - boolean normalized; boolean is_stencil, is_depth, blit_depth, blit_stencil; const struct util_format_description *src_desc = util_format_description(src_tex->format); + struct pipe_blit_info info; assert(filter == PIPE_TEX_MIPFILTER_NEAREST || filter == PIPE_TEX_MIPFILTER_LINEAR); @@ -477,6 +388,12 @@ util_blit_pixels(struct blit_state *ctx, assert((writemask && !zs_writemask && !is_depth && !is_stencil) || (!writemask && (blit_depth || blit_stencil))); + /* + * XXX: z parameter is deprecated. dst->u.tex.first_layer + * specificies the destination layer. + */ + assert(z == 0.0f); + /* * Check for simple case: no format conversion, no flipping, no stretching, * no overlapping, same number of samples. @@ -508,319 +425,55 @@ util_blit_pixels(struct blit_state *ctx, return; } - /* XXX Reading multisample textures is unimplemented. */ - assert(src_tex->nr_samples <= 1); - if (src_tex->nr_samples > 1) { - return; - } - - /* It's a mistake to call this function with a stencil format and - * without shader stencil export. We don't do software fallbacks here. - * Ignore stencil and only copy depth. - */ - if (blit_stencil && !ctx->has_stencil_export) { - blit_stencil = FALSE; - - if (!blit_depth) - return; - } - - if (dst_format == dst->format) { - dst_surface = dst; - } else { - struct pipe_surface templ = *dst; - templ.format = dst_format; - dst_surface = pipe->create_surface(pipe, dst->texture, &templ); - } - - /* Create a temporary texture when src and dest alias. - */ - if (src_tex == dst_surface->texture && - dst_surface->u.tex.level == src_level && - dst_surface->u.tex.first_layer == srcZ0) { - /* Make a temporary texture which contains a copy of the source pixels. - * Then we'll sample from the temporary texture. - */ - struct pipe_resource texTemp; - struct pipe_resource *tex; - struct pipe_sampler_view sv_templ; - struct pipe_box src_box; - const int srcLeft = MIN2(srcX0, srcX1); - const int srcTop = MIN2(srcY0, srcY1); - - if (srcLeft != srcX0) { - /* left-right flip */ - int tmp = dstX0; - dstX0 = dstX1; - dstX1 = tmp; - } - - if (srcTop != srcY0) { - /* up-down flip */ - int tmp = dstY0; - dstY0 = dstY1; - dstY1 = tmp; - } - - /* create temp texture */ - memset(&texTemp, 0, sizeof(texTemp)); - texTemp.target = ctx->internal_target; - texTemp.format = src_format; - texTemp.last_level = 0; - texTemp.width0 = srcW; - texTemp.height0 = srcH; - texTemp.depth0 = 1; - texTemp.array_size = 1; - texTemp.bind = PIPE_BIND_SAMPLER_VIEW; - - tex = screen->resource_create(screen, &texTemp); - if (!tex) - return; - - src_box.x = srcLeft; - src_box.y = srcTop; - src_box.z = srcZ0; - src_box.width = srcW; - src_box.height = srcH; - src_box.depth = 1; - /* load temp texture */ - pipe->resource_copy_region(pipe, - tex, 0, 0, 0, 0, /* dest */ - src_tex, src_level, &src_box); - - normalized = tex->target != PIPE_TEXTURE_RECT; - if(normalized) { - s0 = 0.0f; - s1 = 1.0f; - t0 = 0.0f; - t1 = 1.0f; - } - else { - s0 = 0.0f; - s1 = (float) srcW; - t0 = 0.0f; - t1 = (float) srcH; - } - - u_sampler_view_default_template(&sv_templ, tex, tex->format); - if (!blit_depth && blit_stencil) { - /* set a stencil-only format, e.g. Z24S8 --> X24S8 */ - sv_templ.format = util_format_stencil_only(tex->format); - assert(sv_templ.format != PIPE_FORMAT_NONE); - } - sampler_view = pipe->create_sampler_view(pipe, tex, &sv_templ); - - if (!sampler_view) { - pipe_resource_reference(&tex, NULL); - return; - } - pipe_resource_reference(&tex, NULL); - } - else { - /* Directly sample from the source resource/texture */ - u_sampler_view_default_template(&sv_templ, src_tex, src_format); - if (!blit_depth && blit_stencil) { - /* set a stencil-only format, e.g. Z24S8 --> X24S8 */ - sv_templ.format = util_format_stencil_only(src_format); - assert(sv_templ.format != PIPE_FORMAT_NONE); - } - sampler_view = pipe->create_sampler_view(pipe, src_tex, &sv_templ); - - if (!sampler_view) { - return; - } - - s0 = (float) srcX0; - s1 = (float) srcX1; - t0 = (float) srcY0; - t1 = (float) srcY1; - normalized = sampler_view->texture->target != PIPE_TEXTURE_RECT; - if(normalized) - { - s0 /= (float)(u_minify(sampler_view->texture->width0, src_level)); - s1 /= (float)(u_minify(sampler_view->texture->width0, src_level)); - t0 /= (float)(u_minify(sampler_view->texture->height0, src_level)); - t1 /= (float)(u_minify(sampler_view->texture->height0, src_level)); - } - } - - assert(screen->is_format_supported(screen, sampler_view->format, - ctx->internal_target, sampler_view->texture->nr_samples, - PIPE_BIND_SAMPLER_VIEW)); - assert(screen->is_format_supported(screen, dst_format, ctx->internal_target, - dst_surface->texture->nr_samples, - is_depth || is_stencil ? PIPE_BIND_DEPTH_STENCIL : - PIPE_BIND_RENDER_TARGET)); - - /* save state (restored below) */ - cso_save_blend(ctx->cso); - cso_save_depth_stencil_alpha(ctx->cso); - cso_save_rasterizer(ctx->cso); - cso_save_sample_mask(ctx->cso); - cso_save_samplers(ctx->cso, PIPE_SHADER_FRAGMENT); - cso_save_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT); - cso_save_stream_outputs(ctx->cso); - cso_save_viewport(ctx->cso); - cso_save_framebuffer(ctx->cso); - cso_save_fragment_shader(ctx->cso); - cso_save_vertex_shader(ctx->cso); - cso_save_geometry_shader(ctx->cso); - cso_save_vertex_elements(ctx->cso); - cso_save_aux_vertex_buffer_slot(ctx->cso); - cso_save_render_condition(ctx->cso); - - /* set misc state we care about */ - if (writemask) - cso_set_blend(ctx->cso, &ctx->blend_write_color); - else - cso_set_blend(ctx->cso, &ctx->blend_keep_color); - - cso_set_sample_mask(ctx->cso, ~0); - cso_set_rasterizer(ctx->cso, &ctx->rasterizer); - cso_set_vertex_elements(ctx->cso, 2, ctx->velem); - cso_set_stream_outputs(ctx->cso, 0, NULL, 0); - cso_set_render_condition(ctx->cso, NULL, FALSE, 0); - - /* default sampler state */ - ctx->sampler.normalized_coords = normalized; - ctx->sampler.min_img_filter = filter; - ctx->sampler.mag_img_filter = filter; - ctx->sampler.min_lod = (float) src_level; - ctx->sampler.max_lod = (float) src_level; - - /* Depth stencil state, fragment shader and sampler setup depending on what - * we blit. - */ - if (blit_depth && blit_stencil) { - cso_single_sampler(ctx->cso, PIPE_SHADER_FRAGMENT, 0, &ctx->sampler); - /* don't filter stencil */ - ctx->sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST; - ctx->sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST; - cso_single_sampler(ctx->cso, PIPE_SHADER_FRAGMENT, 1, &ctx->sampler); - - cso_set_depth_stencil_alpha(ctx->cso, &ctx->dsa_write_depthstencil); - set_depthstencil_fragment_shader(ctx, sampler_view->texture->target); - } - else if (blit_depth) { - cso_single_sampler(ctx->cso, PIPE_SHADER_FRAGMENT, 0, &ctx->sampler); - cso_set_depth_stencil_alpha(ctx->cso, &ctx->dsa_write_depth); - set_depth_fragment_shader(ctx, sampler_view->texture->target); - } - else if (blit_stencil) { - /* don't filter stencil */ - ctx->sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST; - ctx->sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST; - cso_single_sampler(ctx->cso, PIPE_SHADER_FRAGMENT, 0, &ctx->sampler); - - cso_set_depth_stencil_alpha(ctx->cso, &ctx->dsa_write_stencil); - set_stencil_fragment_shader(ctx, sampler_view->texture->target); - } - else { /* color */ - cso_single_sampler(ctx->cso, PIPE_SHADER_FRAGMENT, 0, &ctx->sampler); - cso_set_depth_stencil_alpha(ctx->cso, &ctx->dsa_keep_depthstencil); - set_fragment_shader(ctx, writemask, sampler_view->texture->target); - } - cso_single_sampler_done(ctx->cso, PIPE_SHADER_FRAGMENT); - - /* textures */ - if (blit_depth && blit_stencil) { - /* Setup two samplers, one for depth and the other one for stencil. */ - struct pipe_sampler_view templ; - struct pipe_sampler_view *views[2]; - - templ = *sampler_view; - templ.format = util_format_stencil_only(templ.format); - assert(templ.format != PIPE_FORMAT_NONE); - - views[0] = sampler_view; - views[1] = pipe->create_sampler_view(pipe, views[0]->texture, &templ); - cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, 2, views); - - pipe_sampler_view_reference(&views[1], NULL); - } - else { - cso_set_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT, 1, &sampler_view); - } - - /* viewport */ - ctx->viewport.scale[0] = 0.5f * dst_surface->width; - ctx->viewport.scale[1] = 0.5f * dst_surface->height; - ctx->viewport.scale[2] = 0.5f; - ctx->viewport.scale[3] = 1.0f; - ctx->viewport.translate[0] = 0.5f * dst_surface->width; - ctx->viewport.translate[1] = 0.5f * dst_surface->height; - ctx->viewport.translate[2] = 0.5f; - ctx->viewport.translate[3] = 0.0f; - cso_set_viewport(ctx->cso, &ctx->viewport); - - set_vertex_shader(ctx); - cso_set_geometry_shader_handle(ctx->cso, NULL); - - /* drawing dest */ - memset(&fb, 0, sizeof(fb)); - fb.width = dst_surface->width; - fb.height = dst_surface->height; - if (blit_depth || blit_stencil) { - fb.zsbuf = dst_surface; - } else { - fb.nr_cbufs = 1; - fb.cbufs[0] = dst_surface; - } - cso_set_framebuffer(ctx->cso, &fb); - - /* draw quad */ - offset = setup_vertex_data_tex(ctx, - (float) dstX0 / dst_surface->width * 2.0f - 1.0f, - (float) dstY0 / dst_surface->height * 2.0f - 1.0f, - (float) dstX1 / dst_surface->width * 2.0f - 1.0f, - (float) dstY1 / dst_surface->height * 2.0f - 1.0f, - s0, t0, - s1, t1, - z); - - if (ctx->vbuf) { - util_draw_vertex_buffer(ctx->pipe, ctx->cso, ctx->vbuf, - cso_get_aux_vertex_buffer_slot(ctx->cso), - offset, - PIPE_PRIM_TRIANGLE_FAN, - 4, /* verts */ - 2); /* attribs/vert */ - } - - /* restore state we changed */ - cso_restore_blend(ctx->cso); - cso_restore_depth_stencil_alpha(ctx->cso); - cso_restore_rasterizer(ctx->cso); - cso_restore_sample_mask(ctx->cso); - cso_restore_samplers(ctx->cso, PIPE_SHADER_FRAGMENT); - cso_restore_sampler_views(ctx->cso, PIPE_SHADER_FRAGMENT); - cso_restore_viewport(ctx->cso); - cso_restore_framebuffer(ctx->cso); - cso_restore_fragment_shader(ctx->cso); - cso_restore_vertex_shader(ctx->cso); - cso_restore_geometry_shader(ctx->cso); - cso_restore_vertex_elements(ctx->cso); - cso_restore_aux_vertex_buffer_slot(ctx->cso); - cso_restore_stream_outputs(ctx->cso); - cso_restore_render_condition(ctx->cso); - - pipe_sampler_view_reference(&sampler_view, NULL); - if (dst_surface != dst) - pipe_surface_reference(&dst_surface, NULL); + memset(&info, 0, sizeof info); + info.dst.resource = dst->texture; + info.dst.level = dst->u.tex.level; + info.dst.box.x = dstX0; + info.dst.box.y = dstY0; + info.dst.box.z = dst->u.tex.first_layer; + info.dst.box.width = dstX1 - dstX0; + info.dst.box.height = dstY1 - dstY0; + assert(info.dst.box.width >= 0); + assert(info.dst.box.height >= 0); + info.dst.box.depth = 1; + info.dst.format = dst->texture->format; + info.src.resource = src_tex; + info.src.level = src_level; + info.src.box.x = srcX0; + info.src.box.y = srcY0; + info.src.box.z = srcZ0; + info.src.box.width = srcX1 - srcX0; + info.src.box.height = srcY1 - srcY0; + info.src.box.depth = 1; + info.src.format = src_tex->format; + info.mask = writemask | (zs_writemask << 4); + info.filter = filter; + info.scissor_enable = 0; + + pipe->blit(pipe, &info); } /** - * Copy pixel block from src texture to dst surface. + * Copy pixel block from src sampler view to dst surface. + * * The sampler view's first_level field indicates the source * mipmap level to use. - * XXX need some control over blitting Z and/or stencil. + * + * The sampler view's first_layer indicate the layer to use, but for + * cube maps it must point to the first face. Face is passed in src_face. + * + * The main advantage over util_blit_pixels is that it allows to specify swizzles in + * pipe_sampler_view::swizzle_?. + * + * But there is no control over blitting Z and/or stencil. */ void util_blit_pixels_tex(struct blit_state *ctx, struct pipe_sampler_view *src_sampler_view, int srcX0, int srcY0, int srcX1, int srcY1, + unsigned src_face, struct pipe_surface *dst, int dstX0, int dstY0, int dstX1, int dstY1, @@ -922,6 +575,8 @@ util_blit_pixels_tex(struct blit_state *ctx, /* draw quad */ offset = setup_vertex_data_tex(ctx, + src_sampler_view->texture->target, + src_face, (float) dstX0 / dst->width * 2.0f - 1.0f, (float) dstY0 / dst->height * 2.0f - 1.0f, (float) dstX1 / dst->width * 2.0f - 1.0f, diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.h b/mesalib/src/gallium/auxiliary/util/u_blit.h index 56ab03083..bfcd1bb28 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blit.h +++ b/mesalib/src/gallium/auxiliary/util/u_blit.h @@ -73,6 +73,7 @@ util_blit_pixels_tex(struct blit_state *ctx, struct pipe_sampler_view *src_sampler_view, int srcX0, int srcY0, int srcX1, int srcY1, + unsigned src_face, struct pipe_surface *dst, int dstX0, int dstY0, int dstX1, int dstY1, diff --git a/mesalib/src/glsl/Android.gen.mk b/mesalib/src/glsl/Android.gen.mk index 2ed9fa64b..7ec56d4f2 100644 --- a/mesalib/src/glsl/Android.gen.mk +++ b/mesalib/src/glsl/Android.gen.mk @@ -35,10 +35,6 @@ sources := \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c -ifneq ($(LOCAL_IS_HOST_MODULE),true) -sources += builtin_function.cpp -endif - LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += $(intermediates) $(intermediates)/glcpp $(MESA_TOP)/src/glsl/glcpp @@ -81,18 +77,3 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y $(call glsl_local-y-to-c-and-h) - -BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX) - -builtin_function_deps := \ - $(LOCAL_PATH)/builtins/tools/generate_builtins.py \ - $(LOCAL_PATH)/builtins/tools/texture_builtins.py \ - $(BUILTIN_COMPILER) \ - $(wildcard $(LOCAL_PATH)/builtins/profiles/*) \ - $(wildcard $(LOCAL_PATH)/builtins/ir/*) - -$(intermediates)/builtin_function.cpp: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/builtins/tools/generate_builtins.py -$(intermediates)/builtin_function.cpp: $(builtin_function_deps) - @mkdir -p $(dir $@) - @echo "Gen GLSL: $(PRIVATE_MODULE) <= $(notdir $@)" - $(hide) $(PRIVATE_SCRIPT) $(BUILTIN_COMPILER) > $@ || rm -f $@ diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 31f7489d1..96358a737 100644 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -580,6 +580,9 @@ builtin_builder::release() { ralloc_free(mem_ctx); mem_ctx = NULL; + + ralloc_free(shader); + shader = NULL; } void diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp index 11cd6cdc0..6dec205f7 100644 --- a/mesalib/src/glsl/standalone_scaffolding.cpp +++ b/mesalib/src/glsl/standalone_scaffolding.cpp @@ -116,11 +116,13 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) ctx->Const.VertexProgram.MaxAttribs = 16; ctx->Const.VertexProgram.MaxUniformComponents = 512; + ctx->Const.VertexProgram.MaxOutputComponents = 32; ctx->Const.MaxVarying = 8; /* == gl_MaxVaryingFloats / 4 */ ctx->Const.VertexProgram.MaxTextureImageUnits = 0; ctx->Const.MaxCombinedTextureImageUnits = 2; ctx->Const.FragmentProgram.MaxTextureImageUnits = 2; ctx->Const.FragmentProgram.MaxUniformComponents = 64; + ctx->Const.FragmentProgram.MaxInputComponents = 32; ctx->Const.MaxDrawBuffers = 1; diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index d726d117b..58f42cc5b 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -478,18 +478,24 @@ init_program_limits(struct gl_context *ctx, GLenum type, prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS; prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = 4 * MAX_UNIFORMS; + prog->MaxInputComponents = 0; /* value not used */ + prog->MaxOutputComponents = 16 * 4; /* old limit not to break tnl and swrast */ break; case GL_FRAGMENT_PROGRAM_ARB: prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS; prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS; prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = 4 * MAX_UNIFORMS; + prog->MaxInputComponents = 16 * 4; /* old limit not to break tnl and swrast */ + prog->MaxOutputComponents = 0; /* value not used */ break; case MESA_GEOMETRY_PROGRAM: prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS; prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS; prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS; + prog->MaxInputComponents = 16 * 4; /* old limit not to break tnl and swrast */ + prog->MaxOutputComponents = 16 * 4; /* old limit not to break tnl and swrast */ break; default: assert(0 && "Bad program type in init_program_limits()"); diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index 4f6f59ae6..7af5f5591 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -396,6 +396,12 @@ static const int extra_gl32_es3[] = { EXTRA_END, }; +static const int extra_gl32_ARB_geometry_shader4[] = { + EXTRA_VERSION_32, + EXT(ARB_geometry_shader4), + EXTRA_END +}; + static const int extra_ARB_vertex_program_api_es2[] = { EXT(ARB_vertex_program), @@ -502,7 +508,9 @@ print_table_stats(int api) void _mesa_init_get_hash(struct gl_context *ctx) { #ifdef GET_DEBUG - print_table_stats(); + print_table_stats(ctx->API); +#else + (void) ctx; #endif } @@ -709,11 +717,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu case GL_COMPRESSED_TEXTURE_FORMATS_ARB: v->value_int_n.n = _mesa_get_compressed_formats(ctx, v->value_int_n.ints); - ASSERT(v->value_int_n.n <= ARRAY_SIZE(v->value_int_n.ints)); + ASSERT(v->value_int_n.n <= (int) ARRAY_SIZE(v->value_int_n.ints)); break; case GL_MAX_VARYING_FLOATS_ARB: - case GL_MAX_FRAGMENT_INPUT_COMPONENTS: v->value_int = ctx->Const.MaxVarying * 4; break; diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index 30855c37b..fb321a3df 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -329,8 +329,9 @@ descriptor=[ [ "MAJOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], - # GL 3.0 / GLES3 - [ "MAX_FRAGMENT_INPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], + # GL 3.2 / GLES3 + [ "MAX_VERTEX_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents), extra_gl32_es3" ], + [ "MAX_FRAGMENT_INPUT_COMPONENTS", "CONTEXT_INT(Const.FragmentProgram.MaxInputComponents), extra_gl32_es3" ], # GL_ARB_ES3_compatibility [ "MAX_ELEMENT_INDEX", "CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3"], @@ -646,12 +647,12 @@ descriptor=[ [ "MAX_VERTEX_STREAMS", "CONTEXT_INT(Const.MaxVertexStreams), extra_ARB_transform_feedback3" ], # GL_ARB_geometry_shader4 - [ "MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB", "CONTEXT_INT(Const.GeometryProgram.MaxTextureImageUnits), extra_ARB_geometry_shader4" ], - [ "MAX_GEOMETRY_OUTPUT_VERTICES_ARB", "CONTEXT_INT(Const.MaxGeometryOutputVertices), extra_ARB_geometry_shader4" ], - [ "MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxGeometryTotalOutputComponents), extra_ARB_geometry_shader4" ], - [ "MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.GeometryProgram.MaxUniformComponents), extra_ARB_geometry_shader4" ], - [ "MAX_GEOMETRY_VARYING_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxVaryingComponents), extra_ARB_geometry_shader4" ], - [ "MAX_VERTEX_VARYING_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxVaryingComponents), extra_ARB_geometry_shader4" ], + [ "MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB", "CONTEXT_INT(Const.GeometryProgram.MaxTextureImageUnits), extra_gl32_ARB_geometry_shader4" ], + [ "MAX_GEOMETRY_OUTPUT_VERTICES_ARB", "CONTEXT_INT(Const.MaxGeometryOutputVertices), extra_gl32_ARB_geometry_shader4" ], + [ "MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxGeometryTotalOutputComponents), extra_gl32_ARB_geometry_shader4" ], + [ "MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.GeometryProgram.MaxUniformComponents), extra_gl32_ARB_geometry_shader4" ], + [ "MAX_GEOMETRY_VARYING_COMPONENTS_ARB", "CONTEXT_INT(Const.GeometryProgram.MaxOutputComponents), extra_ARB_geometry_shader4" ], + [ "MAX_VERTEX_VARYING_COMPONENTS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents), extra_ARB_geometry_shader4" ], # GL_ARB_color_buffer_float [ "RGBA_FLOAT_MODE_ARB", "BUFFER_FIELD(Visual.floatMode, TYPE_BOOLEAN), extra_core_ARB_color_buffer_float_and_new_buffers" ], @@ -691,6 +692,8 @@ descriptor=[ # GL 3.2 [ "CONTEXT_PROFILE_MASK", "CONTEXT_INT(Const.ProfileMask), extra_version_32" ], + [ "MAX_GEOMETRY_INPUT_COMPONENTS", "CONTEXT_INT(Const.GeometryProgram.MaxInputComponents), extra_version_32" ], + [ "MAX_GEOMETRY_OUTPUT_COMPONENTS", "CONTEXT_INT(Const.GeometryProgram.MaxOutputComponents), extra_version_32" ], # GL_ARB_robustness [ "RESET_NOTIFICATION_STRATEGY_ARB", "CONTEXT_ENUM(Const.ResetStrategy), NO_EXTRA" ], diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 6d700ece8..c88c1c67b 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2832,6 +2832,30 @@ struct gl_program_constants GLuint MaxNativeParameters; /* For shaders */ GLuint MaxUniformComponents; /**< Usually == MaxParameters * 4 */ + + /** + * \name Per-stage input / output limits + * + * Previous to OpenGL 3.2, the intrastage data limits were advertised with + * a single value: GL_MAX_VARYING_COMPONENTS (GL_MAX_VARYING_VECTORS in + * ES). This is stored as \c gl_constants::MaxVarying. + * + * Starting with OpenGL 3.2, the limits are advertised with per-stage + * variables. Each stage as a certain number of outputs that it can feed + * to the next stage and a certain number inputs that it can consume from + * the previous stage. + * + * Vertex shader inputs do not participate this in this accounting. + * These are tracked exclusively by \c gl_program_constants::MaxAttribs. + * + * Fragment shader outputs do not participate this in this accounting. + * These are tracked exclusively by \c gl_constants::MaxDrawBuffers. + */ + /*@{*/ + GLuint MaxInputComponents; + GLuint MaxOutputComponents; + /*@}*/ + /* ES 2.0 and GL_ARB_ES2_compatibility */ struct gl_precision LowFloat, MediumFloat, HighFloat; struct gl_precision LowInt, MediumInt, HighInt; @@ -2906,7 +2930,6 @@ struct gl_constants /** Number of varying vectors between any two shader stages. */ GLuint MaxVarying; - GLuint MaxVaryingComponents; /** @{ * GL_ARB_uniform_buffer_object diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 0b7001bae..97dd73210 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -256,7 +256,10 @@ void st_init_limits(struct st_context *st) c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT, PIPE_SHADER_CAP_MAX_INPUTS); c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING); - c->MaxVaryingComponents = c->MaxVarying * 4; + c->FragmentProgram.MaxInputComponents = c->MaxVarying * 4; + c->VertexProgram.MaxOutputComponents = c->MaxVarying * 4; + c->GeometryProgram.MaxInputComponents = c->MaxVarying * 4; + c->GeometryProgram.MaxOutputComponents = c->MaxVarying * 4; c->MinProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MIN_TEXEL_OFFSET); c->MaxProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXEL_OFFSET); -- cgit v1.2.3