fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 19:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/vega: Silence compiler warnings.

Browse source
This commit is contained in:
Vinson Lee 2009-12-27 22:39:31 -08:00
parent 9d3092d134
commit bf63b9d7a9
6 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/state_trackers/vega/api_path.c
View file

@ -164,8 +164,7 @@ void vgAppendPathData(VGPath dstPath,
return;
}
for (i = 0; i < numSegments; ++i) {
if (pathSegments[i] < VG_CLOSE_PATH ||
pathSegments[i] > VG_LCWARC_TO_REL) {
if (pathSegments[i] > VG_LCWARC_TO_REL) {
vg_set_error(ctx, VG_ILLEGAL_ARGUMENT_ERROR);
return;
}

2
src/gallium/state_trackers/vega/arc.c
View file

@ -528,7 +528,6 @@ static INLINE int num_beziers_needed(struct arc *arc)
double threshold = 0.05;
VGboolean found = VG_FALSE;
int n = 1;
int i;
double min_eta, max_eta;
min_eta = MIN2(arc->eta1, arc->eta2);
@ -562,7 +561,6 @@ static void arc_to_beziers(struct arc *arc,
sin_eta_b, a_cos_eta_b, b_sin_eta_b, a_sin_eta_b,
b_cos_eta_b, x_b, y_b, x_b_dot, y_b_dot, lx, ly;
double t, alpha;
int i;
{ /* always move to the start of the arc */
VGfloat x = arc->x1;

2
src/gallium/state_trackers/vega/bezier.c
View file

@ -343,8 +343,6 @@ static enum shift_result shift(const struct bezier *orig,
float points_shifted[4][2];
float prev_normal[2];
int i;
points[np][0] = orig->x1;
points[np][1] = orig->y1;
map[0] = 0;

4
src/gallium/state_trackers/vega/stroker.c
View file

@ -476,7 +476,7 @@ static enum intersection_type line_intersect(const VGfloat *l1,
const VGfloat *l2,
float *intersection_point)
{
VGfloat isect[2];
VGfloat isect[2] = { 0 };
enum intersection_type type;
VGboolean dx_zero, ldx_zero;
@ -649,7 +649,7 @@ static void create_joins(struct stroker *stroker,
VGfloat prev_line[] = {stroker->back2_x, stroker->back2_y,
stroker->back1_x, stroker->back1_y};
VGfloat isect[2];
VGfloat isect[2] = { 0 };
enum intersection_type type = line_intersect(prev_line, next_line, isect);
if (join == SquareJoin) {

3
src/gallium/state_trackers/vega/vg_context.c
View file

@ -232,10 +232,7 @@ static void update_clip_state(struct vg_context *ctx)
struct pipe_blend_state *blend = &ctx->state.g3d.blend;
struct pipe_framebuffer_state *fb = &ctx->state.g3d.fb;
int i;
<<<<<<< HEAD:src/gallium/state_trackers/vega/vg_context.c
=======
>>>>>>> mesa_7_6_branch:src/gallium/state_trackers/vega/vg_context.c
dsa->depth.writemask = 1;/*glDepthMask(TRUE);*/
dsa->depth.func = PIPE_FUNC_ALWAYS;
dsa->depth.enabled = 1;

1
src/gallium/state_trackers/vega/vg_tracker.c
View file

@ -33,6 +33,7 @@
#include "pipe/p_screen.h"
#include "util/u_memory.h"
#include "util/u_math.h"
#include "util/u_rect.h"
static struct pipe_texture *
create_texture(struct pipe_context *pipe, enum pipe_format format,