X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_state_derived.c;h=bae669e78cb16b26f87295b0610788f508832dd8;hb=e622e010fd838eb30eab46800015516703b76f4d;hp=f63114e7eb74a67cbd3227717aa5f6c2e34f603c;hpb=da8b4c07986e202b0596b729a5eec31c9aec5fcc;p=mesa.git diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index f63114e7eb7..bae669e78cb 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -52,7 +52,6 @@ enum r300_rs_col_write_type { static void r300_draw_emit_attrib(struct r300_context* r300, enum attrib_emit emit, - enum interp_mode interp, int index) { struct r300_vertex_shader* vs = r300->vs_state.state; @@ -62,7 +61,7 @@ static void r300_draw_emit_attrib(struct r300_context* r300, output = draw_find_shader_output(r300->draw, info->output_semantic_name[index], info->output_semantic_index[index]); - draw_emit_vertex_attr(&r300->vertex_info, emit, interp, output); + draw_emit_vertex_attr(&r300->vertex_info, emit, output); } static void r300_draw_emit_all_attribs(struct r300_context* r300) @@ -73,31 +72,27 @@ static void r300_draw_emit_all_attribs(struct r300_context* r300) /* Position. */ if (vs_outputs->pos != ATTR_UNUSED) { - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_PERSPECTIVE, - vs_outputs->pos); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->pos); } else { assert(0); } /* Point size. */ if (vs_outputs->psize != ATTR_UNUSED) { - r300_draw_emit_attrib(r300, EMIT_1F_PSIZE, INTERP_POS, - vs_outputs->psize); + r300_draw_emit_attrib(r300, EMIT_1F_PSIZE, vs_outputs->psize); } /* Colors. */ for (i = 0; i < ATTR_COLOR_COUNT; i++) { if (vs_outputs->color[i] != ATTR_UNUSED) { - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_LINEAR, - vs_outputs->color[i]); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->color[i]); } } /* Back-face colors. */ for (i = 0; i < ATTR_COLOR_COUNT; i++) { if (vs_outputs->bcolor[i] != ATTR_UNUSED) { - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_LINEAR, - vs_outputs->bcolor[i]); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->bcolor[i]); } } @@ -108,16 +103,14 @@ static void r300_draw_emit_all_attribs(struct r300_context* r300) for (i = 0; i < ATTR_GENERIC_COUNT && gen_count < 8; i++) { if (vs_outputs->generic[i] != ATTR_UNUSED && !(r300->sprite_coord_enable & (1 << i))) { - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_PERSPECTIVE, - vs_outputs->generic[i]); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->generic[i]); gen_count++; } } /* Fog coordinates. */ if (gen_count < 8 && vs_outputs->fog != ATTR_UNUSED) { - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_PERSPECTIVE, - vs_outputs->fog); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->fog); gen_count++; } @@ -125,8 +118,7 @@ static void r300_draw_emit_all_attribs(struct r300_context* r300) if (r300_fs(r300)->shader->inputs.wpos != ATTR_UNUSED && gen_count < 8) { DBG(r300, DBG_SWTCL, "draw_emit_attrib: WPOS, index: %i\n", vs_outputs->wpos); - r300_draw_emit_attrib(r300, EMIT_4F, INTERP_PERSPECTIVE, - vs_outputs->wpos); + r300_draw_emit_attrib(r300, EMIT_4F, vs_outputs->wpos); } } @@ -316,6 +308,7 @@ static void r300_update_rs_block(struct r300_context *r300) struct r300_shader_semantics *fs_inputs = &r300_fs(r300)->shader->inputs; struct r300_rs_block rs = {0}; int i, col_count = 0, tex_count = 0, fp_offset = 0, count, loc = 0, tex_ptr = 0; + int gen_offset = 0; void (*rX00_rs_col)(struct r300_rs_block*, int, int, enum r300_rs_swizzle); void (*rX00_rs_col_write)(struct r300_rs_block*, int, int, enum r300_rs_col_write_type); void (*rX00_rs_tex)(struct r300_rs_block*, int, int, enum r300_rs_swizzle); @@ -436,8 +429,60 @@ static void r300_update_rs_block(struct r300_context *r300) fprintf(stderr, "r300: ERROR: FS input FACE unassigned.\n"); } + /* Re-use color varyings for texcoords if possible. + * + * The colors are interpolated as 20-bit floats (reduced precision), + * Use this hack only if there are too many generic varyings. + * (number of generic varyings + fog + wpos > 8) */ + if (r300->screen->caps.is_r500 && !any_bcolor_used && !r300->flatshade && + fs_inputs->face == ATTR_UNUSED && + vs_outputs->num_generic + (vs_outputs->fog != ATTR_UNUSED) + + (fs_inputs->wpos != ATTR_UNUSED) > 8) { + for (i = 0; i < ATTR_GENERIC_COUNT && col_count < 2; i++) { + /* Cannot use color varyings for sprite coords. */ + if (fs_inputs->generic[i] != ATTR_UNUSED && + (r300->sprite_coord_enable & (1 << i))) { + break; + } + + if (vs_outputs->generic[i] != ATTR_UNUSED) { + /* Set up the color in VAP. */ + rs.vap_vsm_vtx_assm |= R300_INPUT_CNTL_COLOR; + rs.vap_out_vtx_fmt[0] |= + R300_VAP_OUTPUT_VTX_FMT_0__COLOR_0_PRESENT << col_count; + stream_loc_notcl[loc++] = 2 + col_count; + + /* Rasterize it. */ + rX00_rs_col(&rs, col_count, col_count, SWIZ_XYZW); + + /* Write it to the FS input register if it's needed by the FS. */ + if (fs_inputs->generic[i] != ATTR_UNUSED) { + rX00_rs_col_write(&rs, col_count, fp_offset, WRITE_COLOR); + fp_offset++; + + DBG(r300, DBG_RS, + "r300: Rasterized generic %i redirected to color %i and written to FS.\n", + i, col_count); + } else { + DBG(r300, DBG_RS, "r300: Rasterized generic %i redirected to color %i unused.\n", + i, col_count); + } + col_count++; + } else { + /* Skip the FS input register, leave it uninitialized. */ + /* If we try to set it to (0,0,0,1), it will lock up. */ + if (fs_inputs->generic[i] != ATTR_UNUSED) { + fp_offset++; + + DBG(r300, DBG_RS, "r300: FS input generic %i unassigned%s.\n", i); + } + } + } + gen_offset = i; + } + /* Rasterize texture coordinates. */ - for (i = 0; i < ATTR_GENERIC_COUNT && tex_count < 8; i++) { + for (i = gen_offset; i < ATTR_GENERIC_COUNT && tex_count < 8; i++) { boolean sprite_coord = false; if (fs_inputs->generic[i] != ATTR_UNUSED) { @@ -605,7 +650,6 @@ static uint32_t r300_get_border_color(enum pipe_format format, { const struct util_format_description *desc; float border_swizzled[4] = {0}; - unsigned i; union util_color uc = {0}; desc = util_format_description(format); @@ -616,7 +660,7 @@ static uint32_t r300_get_border_color(enum pipe_format format, case PIPE_FORMAT_Z16_UNORM: return util_pack_z(PIPE_FORMAT_Z16_UNORM, border[0]); case PIPE_FORMAT_X8Z24_UNORM: - case PIPE_FORMAT_S8_USCALED_Z24_UNORM: + case PIPE_FORMAT_S8_UINT_Z24_UNORM: if (is_r500) { return util_pack_z(PIPE_FORMAT_X8Z24_UNORM, border[0]); } else { @@ -629,22 +673,7 @@ static uint32_t r300_get_border_color(enum pipe_format format, } /* Apply inverse swizzle of the format. */ - for (i = 0; i < 4; i++) { - switch (desc->swizzle[i]) { - case UTIL_FORMAT_SWIZZLE_X: - border_swizzled[0] = border[i]; - break; - case UTIL_FORMAT_SWIZZLE_Y: - border_swizzled[1] = border[i]; - break; - case UTIL_FORMAT_SWIZZLE_Z: - border_swizzled[2] = border[i]; - break; - case UTIL_FORMAT_SWIZZLE_W: - border_swizzled[3] = border[i]; - break; - } - } + util_format_unswizzle_4f(border_swizzled, border, desc->swizzle); /* Compressed formats. */ if (util_format_is_compressed(format)) { @@ -662,18 +691,24 @@ static uint32_t r300_get_border_color(enum pipe_format format, /* The Y component is used for the border color. */ border_swizzled[1] = border_swizzled[0] + 1.0f/32; util_pack_color(border_swizzled, PIPE_FORMAT_B4G4R4A4_UNORM, &uc); - return uc.ui; + return uc.ui[0]; case PIPE_FORMAT_RGTC2_SNORM: case PIPE_FORMAT_LATC2_SNORM: util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_SNORM, &uc); - return uc.ui; + return uc.ui[0]; case PIPE_FORMAT_RGTC2_UNORM: case PIPE_FORMAT_LATC2_UNORM: util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_UNORM, &uc); - return uc.ui; + return uc.ui[0]; + case PIPE_FORMAT_DXT1_SRGB: + case PIPE_FORMAT_DXT1_SRGBA: + case PIPE_FORMAT_DXT3_SRGBA: + case PIPE_FORMAT_DXT5_SRGBA: + util_pack_color(border_swizzled, PIPE_FORMAT_B8G8R8A8_SRGB, &uc); + return uc.ui[0]; default: util_pack_color(border_swizzled, PIPE_FORMAT_B8G8R8A8_UNORM, &uc); - return uc.ui; + return uc.ui[0]; } } @@ -701,10 +736,18 @@ static uint32_t r300_get_border_color(enum pipe_format format, default: case 8: - if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) - util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_SNORM, &uc); - else - util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_UNORM, &uc); + if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) { + util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_SNORM, &uc); + } else if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) { + if (desc->nr_channels == 2) { + border_swizzled[3] = border_swizzled[1]; + util_pack_color(border_swizzled, PIPE_FORMAT_L8A8_SRGB, &uc); + } else { + util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_SRGB, &uc); + } + } else { + util_pack_color(border_swizzled, PIPE_FORMAT_R8G8B8A8_UNORM, &uc); + } break; case 10: @@ -738,7 +781,7 @@ static uint32_t r300_get_border_color(enum pipe_format format, break; } - return uc.ui; + return uc.ui[0]; } static void r300_merge_textures_and_samplers(struct r300_context* r300) @@ -778,14 +821,14 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) /* Set the border color. */ texstate->border_color = r300_get_border_color(view->base.format, - sampler->state.border_color, + sampler->state.border_color.f, r300->screen->caps.is_r500); /* determine min/max levels */ base_level = view->base.u.tex.first_level; min_level = sampler->min_lod; level_count = MIN3(sampler->max_lod, - tex->b.b.b.last_level - base_level, + tex->b.b.last_level - base_level, view->base.u.tex.last_level - base_level); if (base_level + min_level) { @@ -798,35 +841,34 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) * an i-th mipmap level as the zero level. */ base_level += min_level; } - offset = tex->tex_offset + - tex->tex.offset_in_bytes[base_level]; + offset = tex->tex.offset_in_bytes[base_level]; r300_texture_setup_format_state(r300->screen, tex, + view->base.format, base_level, + view->width0_override, + view->height0_override, &texstate->format); texstate->format.tile_config |= offset & 0xffffffe0; assert((offset & 0x1f) == 0); - } else { - texstate->format.tile_config |= tex->tex_offset & 0xffffffe0; - assert((tex->tex_offset & 0x1f) == 0); } /* Assign a texture cache region. */ texstate->format.format1 |= view->texcache_region; /* Depth textures are kinda special. */ - if (util_format_is_depth_or_stencil(tex->b.b.b.format)) { + if (util_format_is_depth_or_stencil(view->base.format)) { unsigned char depth_swizzle[4]; if (!r300->screen->caps.is_r500 && - util_format_get_blocksizebits(tex->b.b.b.format) == 32) { + util_format_get_blocksizebits(view->base.format) == 32) { /* X24x8 is sampled as Y16X16 on r3xx-r4xx. * The depth here is at the Y component. */ for (j = 0; j < 4; j++) - depth_swizzle[j] = UTIL_FORMAT_SWIZZLE_Y; + depth_swizzle[j] = PIPE_SWIZZLE_Y; } else { for (j = 0; j < 4; j++) - depth_swizzle[j] = UTIL_FORMAT_SWIZZLE_X; + depth_swizzle[j] = PIPE_SWIZZLE_X; } /* If compare mode is disabled, sampler view swizzles @@ -844,19 +886,19 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) } if (r300->screen->caps.dxtc_swizzle && - util_format_is_compressed(tex->b.b.b.format)) { + util_format_is_compressed(view->base.format)) { texstate->filter1 |= R400_DXTC_SWIZZLE_ENABLE; } /* to emulate 1D textures through 2D ones correctly */ - if (tex->b.b.b.target == PIPE_TEXTURE_1D) { + if (tex->b.b.target == PIPE_TEXTURE_1D) { texstate->filter0 &= ~R300_TX_WRAP_T_MASK; texstate->filter0 |= R300_TX_WRAP_T(R300_TX_CLAMP_TO_EDGE); } /* The hardware doesn't like CLAMP and CLAMP_TO_BORDER * for the 3rd coordinate if the texture isn't 3D. */ - if (tex->b.b.b.target != PIPE_TEXTURE_3D) { + if (tex->b.b.target != PIPE_TEXTURE_3D) { texstate->filter0 &= ~R300_TX_WRAP_R_MASK; } @@ -890,7 +932,7 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) } /* Float textures only support nearest and mip-nearest filtering. */ - if (util_format_is_float(tex->b.b.b.format)) { + if (util_format_is_float(view->base.format)) { /* No MAG linear filtering. */ if ((texstate->filter0 & R300_TX_MAG_FILTER_MASK) == R300_TX_MAG_FILTER_LINEAR) {