diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:40:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:40:10 +0200 |
| commit | ae06feae7876db47ff0e1fde40cf4a324a412037 (patch) | |
| tree | 4d3879532d8c4c7488d70d02c686586d1a4d28fc /mesalib/src/mesa/main | |
| parent | 683155917770af9e63a938bc450df25d1904d567 (diff) | |
| download | vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.gz vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.tar.bz2 vcxsrv-ae06feae7876db47ff0e1fde40cf4a324a412037.zip | |
mesa git update 11 May 2014
mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/shaderapi.c | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index ca16ae1ec..97538bc7b 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -1058,6 +1058,8 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, if (att->Layered) { if (att_tex_target == GL_TEXTURE_CUBE_MAP) att_layer_count = 6; + else if (att_tex_target == GL_TEXTURE_1D_ARRAY) + att_layer_count = att->Renderbuffer->Height; else att_layer_count = att->Renderbuffer->Depth; } else { diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index 6f84acd01..28739daeb 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -1879,6 +1879,11 @@ _mesa_copy_linked_program_data(gl_shader_stage type, dst_gp->UsesEndPrimitive = src->Geom.UsesEndPrimitive; } break; + case MESA_SHADER_FRAGMENT: { + struct gl_fragment_program *dst_fp = (struct gl_fragment_program *) dst; + dst_fp->FragDepthLayout = src->FragDepthLayout; + } + break; case MESA_SHADER_COMPUTE: { struct gl_compute_program *dst_cp = (struct gl_compute_program *) dst; int i; diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index c7f301cbd..845ba8014 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -3024,7 +3024,7 @@ _mesa_choose_texture_format(struct gl_context *ctx, } /* choose format from scratch */ - f = ctx->Driver.ChooseTextureFormat(ctx, texObj->Target, internalFormat, + f = ctx->Driver.ChooseTextureFormat(ctx, target, internalFormat, format, type); ASSERT(f != MESA_FORMAT_NONE); return f; |