mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency on <GLES2/gl2.h> by replacing GLfloat with float

Browse Source
dev
Tomeu Vizoso 11 years ago committed by Kristian Høgsberg
parent eed9344430
commit 0f0a6ffc2e
3 changed files with 54 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 70
      src/vertex-clipping.c
  2. 30
      src/vertex-clipping.h
  3. 12
      tests/vertex-clip-test.c

70
src/vertex-clipping.c
Unescape View File

@ -23,18 +23,16 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <GLES2/gl2.h>
#include "vertex-clipping.h" #include "vertex-clipping.h"
GLfloat float
float_difference(GLfloat a, GLfloat b) float_difference(float a, float b)
{ {
/* http://www.altdevblogaday.com/2012/02/22/comparing-floating-point-numbers-2012-edition/ */ /* http://www.altdevblogaday.com/2012/02/22/comparing-floating-point-numbers-2012-edition/ */
static const GLfloat max_diff = 4.0f * FLT_MIN; static const float max_diff = 4.0f * FLT_MIN;
static const GLfloat max_rel_diff = 4.0e-5; static const float max_rel_diff = 4.0e-5;
GLfloat diff = a - b; float diff = a - b;
GLfloat adiff = fabsf(diff); float adiff = fabsf(diff);
if (adiff <= max_diff) if (adiff <= max_diff)
return 0.0f; return 0.0f;
@ -50,12 +48,12 @@ float_difference(GLfloat a, GLfloat b)
/* A line segment (p1x, p1y)-(p2x, p2y) intersects the line x = x_arg. /* A line segment (p1x, p1y)-(p2x, p2y) intersects the line x = x_arg.
* Compute the y coordinate of the intersection. * Compute the y coordinate of the intersection.
*/ */
static GLfloat static float
clip_intersect_y(GLfloat p1x, GLfloat p1y, GLfloat p2x, GLfloat p2y, clip_intersect_y(float p1x, float p1y, float p2x, float p2y,
GLfloat x_arg) float x_arg)
{ {
GLfloat a; float a;
GLfloat diff = float_difference(p1x, p2x); float diff = float_difference(p1x, p2x);
/* Practically vertical line segment, yet the end points have already /* Practically vertical line segment, yet the end points have already
* been determined to be on different sides of the line. Therefore * been determined to be on different sides of the line. Therefore
@ -72,12 +70,12 @@ clip_intersect_y(GLfloat p1x, GLfloat p1y, GLfloat p2x, GLfloat p2y,
/* A line segment (p1x, p1y)-(p2x, p2y) intersects the line y = y_arg. /* A line segment (p1x, p1y)-(p2x, p2y) intersects the line y = y_arg.
* Compute the x coordinate of the intersection. * Compute the x coordinate of the intersection.
*/ */
static GLfloat static float
clip_intersect_x(GLfloat p1x, GLfloat p1y, GLfloat p2x, GLfloat p2y, clip_intersect_x(float p1x, float p1y, float p2x, float p2y,
GLfloat y_arg) float y_arg)
{ {
GLfloat a; float a;
GLfloat diff = float_difference(p1y, p2y); float diff = float_difference(p1y, p2y);
/* Practically horizontal line segment, yet the end points have already /* Practically horizontal line segment, yet the end points have already
* been determined to be on different sides of the line. Therefore * been determined to be on different sides of the line. Therefore
@ -99,32 +97,32 @@ enum path_transition {
}; };
static void static void
clip_append_vertex(struct clip_context *ctx, GLfloat x, GLfloat y) clip_append_vertex(struct clip_context *ctx, float x, float y)
{ {
*ctx->vertices.x++ = x; *ctx->vertices.x++ = x;
*ctx->vertices.y++ = y; *ctx->vertices.y++ = y;
} }
static enum path_transition static enum path_transition
path_transition_left_edge(struct clip_context *ctx, GLfloat x, GLfloat y) path_transition_left_edge(struct clip_context *ctx, float x, float y)
{ {
return ((ctx->prev.x >= ctx->clip.x1) << 1) | (x >= ctx->clip.x1); return ((ctx->prev.x >= ctx->clip.x1) << 1) | (x >= ctx->clip.x1);
} }
static enum path_transition static enum path_transition
path_transition_right_edge(struct clip_context *ctx, GLfloat x, GLfloat y) path_transition_right_edge(struct clip_context *ctx, float x, float y)
{ {
return ((ctx->prev.x < ctx->clip.x2) << 1) | (x < ctx->clip.x2); return ((ctx->prev.x < ctx->clip.x2) << 1) | (x < ctx->clip.x2);
} }
static enum path_transition static enum path_transition
path_transition_top_edge(struct clip_context *ctx, GLfloat x, GLfloat y) path_transition_top_edge(struct clip_context *ctx, float x, float y)
{ {
return ((ctx->prev.y >= ctx->clip.y1) << 1) | (y >= ctx->clip.y1); return ((ctx->prev.y >= ctx->clip.y1) << 1) | (y >= ctx->clip.y1);
} }
static enum path_transition static enum path_transition
path_transition_bottom_edge(struct clip_context *ctx, GLfloat x, GLfloat y) path_transition_bottom_edge(struct clip_context *ctx, float x, float y)
{ {
return ((ctx->prev.y < ctx->clip.y2) << 1) | (y < ctx->clip.y2); return ((ctx->prev.y < ctx->clip.y2) << 1) | (y < ctx->clip.y2);
} }
@ -132,9 +130,9 @@ path_transition_bottom_edge(struct clip_context *ctx, GLfloat x, GLfloat y)
static void static void
clip_polygon_leftright(struct clip_context *ctx, clip_polygon_leftright(struct clip_context *ctx,
enum path_transition transition, enum path_transition transition,
GLfloat x, GLfloat y, GLfloat clip_x) float x, float y, float clip_x)
{ {
GLfloat yi; float yi;
switch (transition) { switch (transition) {
case PATH_TRANSITION_IN_TO_IN: case PATH_TRANSITION_IN_TO_IN:
@ -163,9 +161,9 @@ clip_polygon_leftright(struct clip_context *ctx,
static void static void
clip_polygon_topbottom(struct clip_context *ctx, clip_polygon_topbottom(struct clip_context *ctx,
enum path_transition transition, enum path_transition transition,
GLfloat x, GLfloat y, GLfloat clip_y) float x, float y, float clip_y)
{ {
GLfloat xi; float xi;
switch (transition) { switch (transition) {
case PATH_TRANSITION_IN_TO_IN: case PATH_TRANSITION_IN_TO_IN:
@ -193,7 +191,7 @@ clip_polygon_topbottom(struct clip_context *ctx,
static void static void
clip_context_prepare(struct clip_context *ctx, const struct polygon8 *src, clip_context_prepare(struct clip_context *ctx, const struct polygon8 *src,
GLfloat *dst_x, GLfloat *dst_y) float *dst_x, float *dst_y)
{ {
ctx->prev.x = src->x[src->n - 1]; ctx->prev.x = src->x[src->n - 1];
ctx->prev.y = src->y[src->n - 1]; ctx->prev.y = src->y[src->n - 1];
@ -203,7 +201,7 @@ clip_context_prepare(struct clip_context *ctx, const struct polygon8 *src,
static int static int
clip_polygon_left(struct clip_context *ctx, const struct polygon8 *src, clip_polygon_left(struct clip_context *ctx, const struct polygon8 *src,
GLfloat *dst_x, GLfloat *dst_y) float *dst_x, float *dst_y)
{ {
enum path_transition trans; enum path_transition trans;
int i; int i;
@ -219,7 +217,7 @@ clip_polygon_left(struct clip_context *ctx, const struct polygon8 *src,
static int static int
clip_polygon_right(struct clip_context *ctx, const struct polygon8 *src, clip_polygon_right(struct clip_context *ctx, const struct polygon8 *src,
GLfloat *dst_x, GLfloat *dst_y) float *dst_x, float *dst_y)
{ {
enum path_transition trans; enum path_transition trans;
int i; int i;
@ -235,7 +233,7 @@ clip_polygon_right(struct clip_context *ctx, const struct polygon8 *src,
static int static int
clip_polygon_top(struct clip_context *ctx, const struct polygon8 *src, clip_polygon_top(struct clip_context *ctx, const struct polygon8 *src,
GLfloat *dst_x, GLfloat *dst_y) float *dst_x, float *dst_y)
{ {
enum path_transition trans; enum path_transition trans;
int i; int i;
@ -251,7 +249,7 @@ clip_polygon_top(struct clip_context *ctx, const struct polygon8 *src,
static int static int
clip_polygon_bottom(struct clip_context *ctx, const struct polygon8 *src, clip_polygon_bottom(struct clip_context *ctx, const struct polygon8 *src,
GLfloat *dst_x, GLfloat *dst_y) float *dst_x, float *dst_y)
{ {
enum path_transition trans; enum path_transition trans;
int i; int i;
@ -272,8 +270,8 @@ clip_polygon_bottom(struct clip_context *ctx, const struct polygon8 *src,
int int
clip_simple(struct clip_context *ctx, clip_simple(struct clip_context *ctx,
struct polygon8 *surf, struct polygon8 *surf,
GLfloat *ex, float *ex,
GLfloat *ey) float *ey)
{ {
int i; int i;
for (i = 0; i < surf->n; i++) { for (i = 0; i < surf->n; i++) {
@ -286,8 +284,8 @@ clip_simple(struct clip_context *ctx,
int int
clip_transformed(struct clip_context *ctx, clip_transformed(struct clip_context *ctx,
struct polygon8 *surf, struct polygon8 *surf,
GLfloat *ex, float *ex,
GLfloat *ey) float *ey)
{ {
struct polygon8 polygon; struct polygon8 polygon;
int i, n; int i, n;

30
src/vertex-clipping.h
Unescape View File

@ -22,44 +22,42 @@
#ifndef _WESTON_VERTEX_CLIPPING_H #ifndef _WESTON_VERTEX_CLIPPING_H
#define _WESTON_VERTEX_CLIPPING_H #define _WESTON_VERTEX_CLIPPING_H
#include <GLES2/gl2.h>
struct polygon8 { struct polygon8 {
GLfloat x[8]; float x[8];
GLfloat y[8]; float y[8];
int n; int n;
}; };
struct clip_context { struct clip_context {
struct { struct {
GLfloat x; float x;
GLfloat y; float y;
} prev; } prev;
struct { struct {
GLfloat x1, y1; float x1, y1;
GLfloat x2, y2; float x2, y2;
} clip; } clip;
struct { struct {
GLfloat *x; float *x;
GLfloat *y; float *y;
} vertices; } vertices;
}; };
GLfloat float
float_difference(GLfloat a, GLfloat b); float_difference(float a, float b);
int int
clip_simple(struct clip_context *ctx, clip_simple(struct clip_context *ctx,
struct polygon8 *surf, struct polygon8 *surf,
GLfloat *ex, float *ex,
GLfloat *ey); float *ey);
int int
clip_transformed(struct clip_context *ctx, clip_transformed(struct clip_context *ctx,
struct polygon8 *surf, struct polygon8 *surf,
GLfloat *ex, float *ex,
GLfloat *ey);\ float *ey);\
#endif #endif

12
tests/vertex-clip-test.c
Unescape View File

@ -56,8 +56,8 @@ populate_clip_context (struct clip_context *ctx)
static int static int
clip_polygon (struct clip_context *ctx, clip_polygon (struct clip_context *ctx,
struct polygon8 *polygon, struct polygon8 *polygon,
GLfloat *vertices_x, float *vertices_x,
GLfloat *vertices_y) float *vertices_y)
{ {
populate_clip_context(ctx); populate_clip_context(ctx);
return clip_transformed(ctx, polygon, vertices_x, vertices_y); return clip_transformed(ctx, polygon, vertices_x, vertices_y);
@ -181,8 +181,8 @@ TEST_P(clip_polygon_n_vertices_emitted, test_data)
struct vertex_clip_test_data *tdata = data; struct vertex_clip_test_data *tdata = data;
struct clip_context ctx; struct clip_context ctx;
struct polygon8 polygon; struct polygon8 polygon;
GLfloat vertices_x[8]; float vertices_x[8];
GLfloat vertices_y[8]; float vertices_y[8];
deep_copy_polygon8(&tdata->surface, &polygon); deep_copy_polygon8(&tdata->surface, &polygon);
int emitted = clip_polygon(&ctx, &polygon, vertices_x, vertices_y); int emitted = clip_polygon(&ctx, &polygon, vertices_x, vertices_y);
@ -194,8 +194,8 @@ TEST_P(clip_polygon_expected_vertices, test_data)
struct vertex_clip_test_data *tdata = data; struct vertex_clip_test_data *tdata = data;
struct clip_context ctx; struct clip_context ctx;
struct polygon8 polygon; struct polygon8 polygon;
GLfloat vertices_x[8]; float vertices_x[8];
GLfloat vertices_y[8]; float vertices_y[8];
deep_copy_polygon8(&tdata->surface, &polygon); deep_copy_polygon8(&tdata->surface, &polygon);
int emitted = clip_polygon(&ctx, &polygon, vertices_x, vertices_y); int emitted = clip_polygon(&ctx, &polygon, vertices_x, vertices_y);
int i = 0; int i = 0;

Write Preview
Loading…
Cancel
Save