r300g: remove unnecessary assertions

Also, correct typos in comments.
This commit is contained in:
Marek Olšák 2009-10-30 13:08:37 +01:00 committed by Joakim Sindholt
parent ace78d90de
commit 11180b4471
2 changed files with 2 additions and 5 deletions

View file

@ -862,10 +862,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
# define R300_POINTSIZE_X_MASK 0xffff0000
# define R300_POINTSIZE_MAX (R300_POINTSIZE_Y_MASK / 6)
/* Blue fill color */
/* Red fill color */
#define R500_GA_FILL_R 0x4220
/* Blue fill color */
/* Green fill color */
#define R500_GA_FILL_G 0x4224
/* Blue fill color */

View file

@ -608,17 +608,14 @@ static void r300_set_viewport_state(struct pipe_context* pipe,
r300->viewport_state->vte_control = R300_VTX_W0_FMT;
if (state->scale[0] != 1.0f) {
assert(state->scale[0] != 0.0f);
r300->viewport_state->xscale = state->scale[0];
r300->viewport_state->vte_control |= R300_VPORT_X_SCALE_ENA;
}
if (state->scale[1] != 1.0f) {
assert(state->scale[1] != 0.0f);
r300->viewport_state->yscale = state->scale[1];
r300->viewport_state->vte_control |= R300_VPORT_Y_SCALE_ENA;
}
if (state->scale[2] != 1.0f) {
assert(state->scale[2] != 0.0f);
r300->viewport_state->zscale = state->scale[2];
r300->viewport_state->vte_control |= R300_VPORT_Z_SCALE_ENA;
}