[Mesa-dev] [PATCH 2/4] glapi: Fix build break in 'make check' on non-shared-glapi builds

[Dieter Nützel]

Am 03.04.2014 01:19, schrieb Ian Romanick:
> On 04/02/2014 03:43 PM, Dieter Nützel wrote:
>> Am 02.04.2014 08:12, schrieb Timothy Arceri:
>>> On Wed, 2014-04-02 at 00:56 +0200, Dieter Nützel wrote:
>>>> Hello Ian, hello Timothy,
>>>> 
>>>> does this fix the regression introduced with commit fb78fa58?
>>>> 
>>>> [Mesa-dev] Mesa git (r600g): OpenGL Error(GL_INVALID_OPERATION):
>>>> initTexture2D (bisected)
>>>> http://lists.freedesktop.org/archives/mesa-dev/2014-March/056165.html
>>>> 
>>>> Thanks,
>>>>    Dieter
>>> 
>>> Hi Dieter,
>>> 
>>> I just ran ./build/Release/gl-320-primitive-sprite on Mesa 
>>> 10.2.0-devel
>>> (git-76ba50a) on Intel graphics and it ran fine with no error. Have 
>>> you
>>> tried running it again with the latest code from git?
>>> Tim
>> 
>> Hello Tim,
>> 
>> thank you very much for your direct reply!
>> I've retested it with Mesa git daily on my _32bit_ system.
>> All with same result.
>> I even recompiled ogl-samples after recheckout several times NO go.
>> Last try last night 8-(
>> 
>> But,
>> 
>> ...argh,
>> after your request I've cloned ogl-samples this evening again and 
>> can't
>> compile it anylonger. Someone changed the code to compile on 64 bit
>> system only now, I think:
>> 
>> [ 13%] Building CXX object
>> framework/CMakeFiles/framework.dir/compiler.cpp.o
>> Linking CXX static library libframework.a
>> [ 13%] Built target framework
>> Scanning dependencies of target es-200-draw-elements
>> [ 13%] Building CXX object
>> tests/CMakeFiles/es-200-draw-elements.dir/es-200-draw-elements.cpp.o
>> Linking CXX executable ../build/Release/es-200-draw-elements
>> /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/bin/ld:
>> skipping incompatible
>> /opt/ogl-samples/external/FreeImage-3.15.4/linux64/libfreeimage.a when
>> searching for -lfreeimage
> 
> He's shipping a prebuilt .a???  Madness!

It seems so ;-(

> Is there source code for FreeImage included?

Can't find any.

> Can you just build a 32-bit version?

I see only linux64.

> It seems like he has a crazy build system...

/opt/ogl-samples> l external/FreeImage-3.15.4/*
-rw-r--r-- 1 dieter users 53617  3. Apr 00:25 
external/FreeImage-3.15.4/FreeImage.h

external/FreeImage-3.15.4/linux64:
insgesamt 6424
drwxr-xr-x 2 dieter users    4096  3. Apr 01:16 .
drwxr-xr-x 6 dieter users    4096  3. Apr 01:16 ..
-rw-r--r-- 1 dieter users 6877852  3. Apr 01:16 libfreeimage.a

external/FreeImage-3.15.4/macosx:
insgesamt 9592
drwxr-xr-x 2 dieter users     4096  3. Apr 01:16 .
drwxr-xr-x 6 dieter users     4096  3. Apr 01:16 ..
-rw-r--r-- 1 dieter users 10397040  3. Apr 01:16 libfreeimage.a

external/FreeImage-3.15.4/win32:
insgesamt 2452
drwxr-xr-x 2 dieter users    4096  3. Apr 00:25 .
drwxr-xr-x 6 dieter users    4096  3. Apr 01:16 ..
-rw-r--r-- 1 dieter users 2732032  3. Apr 00:25 FreeImage.dll
-rw-r--r-- 1 dieter users   64482  3. Apr 00:25 FreeImage.lib

external/FreeImage-3.15.4/win64:
insgesamt 3208
drwxr-xr-x 2 dieter users    4096  3. Apr 00:25 .
drwxr-xr-x 6 dieter users    4096  3. Apr 01:16 ..
-rw-r--r-- 1 dieter users 3508736  3. Apr 00:25 FreeImage.dll
-rw-r--r-- 1 dieter users   60368  3. Apr 00:25 FreeImage.lib

Worked all OK before 18. March 2014.
Tried several older versions but no success at the moment.
git checkout `git rev-list -n 1 --before="2014-03-18" master`

-Dieter

>> /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/bin/ld:
>> cannot find -lfreeimage
>> collect2: error: ld returned 1 exit status
>> make[2]: *** [build/Release/es-200-draw-elements] Fehler 1
>> make[1]: *** [tests/CMakeFiles/es-200-draw-elements.dir/all] Fehler 2
>> make: *** [all] Fehler 2
>> 69.267u 4.505s 1:27.26 84.5%    0+0k 12368+11176io 44pf+0w
>> 
>> I'll try to go back some days in ogl-samples repository and try to get
>> it running (with Mesa 10.1.0), again as starting point.
>> 
>> Any hints?
>> 
>> -Dieter
>> 
>>>> Am 01.04.2014 22:15, schrieb Ian Romanick:
>>>> > From: Ian Romanick <ian.d.romanick at intel.com>
>>>> >
>>>> > Commit fb78fa58 made the GL_ARB_debug_output functions aliases of the
>>>> > GL_KHR_debug output functions.  As a result, the function names in
>>>> > struct _glapi_table also changed.  The table in check_table.cpp used
>>>> > the
>>>> > ARB names.
>>>> >
>>>> > Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>>>> > Cc: Vinson Lee <vlee at freedesktop.org>
>>>> > Cc: Timothy Arceri <t_arceri at yahoo.com.au>
>>>> > ---
>>>> >  src/mapi/glapi/tests/check_table.cpp | 8 ++++----
>>>> >  1 file changed, 4 insertions(+), 4 deletions(-)
>>>> >
>>>> > diff --git a/src/mapi/glapi/tests/check_table.cpp
>>>> > b/src/mapi/glapi/tests/check_table.cpp
>>>> > index 375645b..89d9073 100644
>>>> > --- a/src/mapi/glapi/tests/check_table.cpp
>>>> > +++ b/src/mapi/glapi/tests/check_table.cpp
>>>> > @@ -1227,10 +1227,10 @@ const struct name_offset known_dispatch[] = {
>>>> >     { "glGetShaderPrecisionFormat", _O(GetShaderPrecisionFormat) },
>>>> >     { "glReleaseShaderCompiler", _O(ReleaseShaderCompiler) },
>>>> >     { "glShaderBinary", _O(ShaderBinary) },
>>>> > -   { "glDebugMessageCallbackARB", _O(DebugMessageCallbackARB) },
>>>> > -   { "glDebugMessageControlARB", _O(DebugMessageControlARB) },
>>>> > -   { "glDebugMessageInsertARB", _O(DebugMessageInsertARB) },
>>>> > -   { "glGetDebugMessageLogARB", _O(GetDebugMessageLogARB) },
>>>> > +   { "glDebugMessageCallback", _O(DebugMessageCallback) },
>>>> > +   { "glDebugMessageControl", _O(DebugMessageControl) },
>>>> > +   { "glDebugMessageInsert", _O(DebugMessageInsert) },
>>>> > +   { "glGetDebugMessageLog", _O(GetDebugMessageLog) },
>>>> >     { "glGetGraphicsResetStatusARB", _O(GetGraphicsResetStatusARB) },
>>>> >     { "glGetnColorTableARB", _O(GetnColorTableARB) },
>>>> >     { "glGetnCompressedTexImageARB", _O(GetnCompressedTexImageARB) },
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>