[Mesa-dev] [PATCH 1/3] mesa: remove unneeded error check in create_textures()

[Brian Paul]

On 10/07/2015 04:47 PM, Mark Janes wrote:
> Brian Paul <brianp at vmware.com> writes:
>
>> On 10/05/2015 05:18 PM, Mark Janes wrote:
>>> I tested this patch and found:
>>>
>>> regressions:
>>>     spec.arb_shader_storage_buffer_object.layout-std140-write-shader  (BDW only)
>>>       expected[1] = 1.00. Read value: 0.00
>>>
>>>     spec.arb_copy_image.arb_copy_image-srgb-copy  (assertion)
>>>       arb_copy_image-srgb-copy: src/mesa/main/texobj.c:1739:
>>>         _mesa_BindTexture: Assertion `newTexObj->TargetIndex == targetIndex'
>>>         failed.
>>
>> Can you provide the stack trace from gdb at least?
>
> #0  0x00007ffff58e0107 in __GI_raise (sig=sig at entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
> #1  0x00007ffff58e14e8 in __GI_abort () at abort.c:89
> #2  0x00007ffff58d9226 in __assert_fail_base (fmt=0x7ffff5a0fd08 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=assertion at entry=0x7ffff22a1bea "index < NUM_TEXTURE_TARGETS", file=file at entry=0x7ffff22a2048 "/home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/main/texobj.c", line=line at entry=1368, function=function at entry=0x7ffff22a2770 <__PRETTY_FUNCTION__.37205> "unbind_texobj_from_texunits") at assert.c:92
> #3  0x00007ffff58d92d2 in __GI___assert_fail (assertion=assertion at entry=0x7ffff22a1bea "index < NUM_TEXTURE_TARGETS", file=file at entry=0x7ffff22a2048 "/home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/main/texobj.c", line=line at entry=1368, function=function at entry=0x7ffff22a2770 <__PRETTY_FUNCTION__.37205> "unbind_texobj_from_texunits") at assert.c:101
> #4  0x00007ffff1f6119f in unbind_texobj_from_texunits (ctx=0x7ffff7fce040, texObj=0x956470) at /home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/main/texobj.c:1368
> #5  0x00007ffff1f62195 in _mesa_DeleteTextures (n=n at entry=1, textures=textures at entry=0x7fffffffd24c) at /home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/main/texobj.c:1483
> #6  0x00007ffff201e2ff in _mesa_meta_CopyImageSubData_uncompressed (ctx=ctx at entry=0x7ffff7fce040, src_tex_image=src_tex_image at entry=0x95de80, src_renderbuffer=src_renderbuffer at entry=0x0, src_x=src_x at entry=0, src_y=src_y at entry=0, src_z=src_z at entry=0, dst_tex_image=0x956bc0, dst_renderbuffer=0x0, dst_x=0, dst_y=0, dst_z=0, src_width=32, src_height=32) at /home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/drivers/common/meta_copy_image.c:289
> #7  0x00007ffff2251275 in intel_copy_image_sub_data (ctx=0x7ffff7fce040, src_image=0x95de80, src_renderbuffer=0x0, src_x=0, src_y=0, src_z=0, dst_image=0x956bc0, dst_renderbuffer=0x0, dst_x=0, dst_y=0, dst_z=0, src_width=32, src_height=32) at /home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/drivers/dri/i965/intel_copy_image.c:216
> #8  0x00007ffff1e7ae38 in _mesa_CopyImageSubData (srcName=<optimized out>, srcTarget=<optimized out>, srcLevel=0, srcX=0, srcY=0, srcZ=<optimized out>, dstName=3, dstTarget=3553, dstLevel=0, dstX=0, dstY=0, dstZ=0, srcWidth=32, srcHeight=32, srcDepth=1) at /home/majanes/src/mesa_jenkins/repos/mesa/src/mesa/main/copyimage.c:528
> #9  0x00007ffff7ab3933 in stub_glCopyImageSubData (srcName=2, srcTarget=3553, srcLevel=0, srcX=0, srcY=0, srcZ=0, dstName=3, dstTarget=3553, dstLevel=0, dstX=0, dstY=0, dstZ=0, srcWidth=32, srcHeight=32, srcDepth=1) at /home/majanes/src/mesa_jenkins/repos/piglit/build_m64/tests/util/piglit-dispatch-gen.c:7769
> #10 0x0000000000401001 in test_srgb_copy () at /home/majanes/src/mesa_jenkins/repos/piglit/tests/spec/arb_copy_image/srgb-copy.c:80
> #11 0x0000000000401111 in piglit_display () at /home/majanes/src/mesa_jenkins/repos/piglit/tests/spec/arb_copy_image/srgb-copy.c:115
> #12 0x00007ffff7b42de7 in run_test (gl_fw=0x613c20, argc=1, argv=0x7fffffffe728) at /home/majanes/src/mesa_jenkins/repos/piglit/tests/util/piglit-framework-gl/piglit_fbo_framework.c:52
> #13 0x00007ffff7b2962c in piglit_gl_test_run (argc=1, argv=0x7fffffffe728, config=0x7fffffffe5f0) at /home/majanes/src/mesa_jenkins/repos/piglit/tests/util/piglit-framework-gl.c:199
> #14 0x0000000000400e80 in main (argc=1, argv=0x7fffffffe728) at /home/majanes/src/mesa_jenkins/repos/piglit/tests/spec/arb_copy_image/srgb-copy.c:43
>
> in "assert(index < NUM_TEXTURE_TARGETS);", index = NUM_TEXTURE_TARGETS.

OK, it looks like some meta code sets the gl_texture_object::Target 
field but not the TargetIndex field.  I'll post a v2 patch.  Please retest.

Thanks.

-Brian