diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
| commit | 3865d60ef607cbb00c819e905e40d3628b8eca29 (patch) | |
| tree | 73d8064951a7abbe4897bcc25959463d08544495 /mesalib/src/mesa/state_tracker/st_cb_msaa.c | |
| parent | 294a395f15dec9e7aa24b83b08f47ba54b9bd232 (diff) | |
| parent | e708bebcc029873004ade4241f347ce8c58896af (diff) | |
| download | vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.gz vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.bz2 vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_msaa.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_msaa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_msaa.c b/mesalib/src/mesa/state_tracker/st_cb_msaa.c index bbf2b2c5c..e9955b62b 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_msaa.c +++ b/mesalib/src/mesa/state_tracker/st_cb_msaa.c @@ -40,7 +40,7 @@ static void st_GetSamplePosition(struct gl_context *ctx, struct gl_framebuffer *fb, GLuint index, - GLfloat *outValue) + GLfloat *outPos) { struct st_context *st = st_context(ctx); @@ -48,7 +48,9 @@ st_GetSamplePosition(struct gl_context *ctx, if (st->pipe->get_sample_position) st->pipe->get_sample_position(st->pipe, (unsigned) fb->Visual.samples, - index, outValue); + index, outPos); + else + outPos[0] = outPos[1] = 0.5f; } |