diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 22:17:40 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 22:17:40 +0100 |
| commit | 8574eba804031f6b19713f0b02952280730bf62e (patch) | |
| tree | 9afa4d6fe299d43ab7e580dc08a5547120274561 /mesalib/src/mesa/state_tracker/st_context.c | |
| parent | eef70231353a6103f47fcae88a6e89e765e5cd47 (diff) | |
| download | vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.tar.gz vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.tar.bz2 vcxsrv-8574eba804031f6b19713f0b02952280730bf62e.zip | |
fontconfig mesa git update 5 Mar 2015
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c index 5834ebad3..5fe132ac2 100644 --- a/mesalib/src/mesa/state_tracker/st_context.c +++ b/mesalib/src/mesa/state_tracker/st_context.c @@ -117,8 +117,8 @@ st_destroy_context_priv(struct st_context *st) st_destroy_drawpix(st); st_destroy_drawtex(st); - for (shader = 0; shader < Elements(st->state.sampler_views); shader++) { - for (i = 0; i < Elements(st->state.sampler_views[0]); i++) { + for (shader = 0; shader < ARRAY_SIZE(st->state.sampler_views); shader++) { + for (i = 0; i < ARRAY_SIZE(st->state.sampler_views[0]); i++) { pipe_sampler_view_release(st->pipe, &st->state.sampler_views[shader][i]); } @@ -200,7 +200,7 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe, /* Vertex element objects used for drawing rectangles for glBitmap, * glDrawPixels, glClear, etc. */ - for (i = 0; i < Elements(st->velems_util_draw); i++) { + for (i = 0; i < ARRAY_SIZE(st->velems_util_draw); i++) { memset(&st->velems_util_draw[i], 0, sizeof(struct pipe_vertex_element)); st->velems_util_draw[i].src_offset = i * 4 * sizeof(float); st->velems_util_draw[i].instance_divisor = 0; |