Hi Kristian, Most of the mesa builds (make and scons) got broken with this merge due to missing *_remap_index symbols in remap_helper.h
I took a look but it's not obvious to me how to fix it. Jose gcc -c -I../../include -I../../src/mesa -I../../src/gallium/include -I../../src/gallium/auxiliary -Wall -Wmissing-prototypes -Wdeclaration-after-statement -Wpointer-arith -g -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN -DDEBUG -DDEBUG_MATH -I/usr/X11R6/include -std=c99 -ffast-math -fno-strict-aliasing main/api_exec.c -o main/api_exec.o In file included from main/api_exec.c:112: ../../src/mesa/main/remap_helper.h:4427: error: ‘AttachShader_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4428: error: ‘CreateProgram_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4429: error: ‘CreateShader_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4430: error: ‘DeleteProgram_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4431: error: ‘DeleteShader_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4432: error: ‘DetachShader_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4433: error: ‘GetAttachedShaders_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4434: error: ‘GetProgramInfoLog_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4435: error: ‘GetProgramiv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4436: error: ‘GetShaderInfoLog_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4437: error: ‘GetShaderiv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4438: error: ‘IsProgram_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4439: error: ‘IsShader_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4440: error: ‘StencilFuncSeparate_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4441: error: ‘StencilMaskSeparate_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4442: error: ‘StencilOpSeparate_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4443: error: ‘UniformMatrix2x3fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4444: error: ‘UniformMatrix2x4fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4445: error: ‘UniformMatrix3x2fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4446: error: ‘UniformMatrix3x4fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4447: error: ‘UniformMatrix4x2fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4448: error: ‘UniformMatrix4x3fv_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4449: error: ‘DrawArraysInstanced_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4450: error: ‘DrawElementsInstanced_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4451: error: ‘LoadTransposeMatrixdARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4452: error: ‘LoadTransposeMatrixfARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4453: error: ‘MultTransposeMatrixdARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4454: error: ‘MultTransposeMatrixfARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4455: error: ‘SampleCoverageARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4456: error: ‘CompressedTexImage1DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4457: error: ‘CompressedTexImage2DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4458: error: ‘CompressedTexImage3DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4459: error: ‘CompressedTexSubImage1DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4460: error: ‘CompressedTexSubImage2DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4461: error: ‘CompressedTexSubImage3DARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4462: error: ‘GetCompressedTexImageARB_remap_index’ undeclared here (not in a function) ../../src/mesa/main/remap_helper.h:4463: error: ‘DisableVertexAttribArrayARB_remap_index’ undeclared here (not in a function) On Sun, 2010-05-02 at 07:18 -0700, Kristian Høgsberg wrote: > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=0870e4a2022cff79805613ae7cd4b9237a2f564c > Merge: 9d3360567346036f1c2b0b5e9de9bd123d883762 > 9fd5fa05122aa0cac0051fa92d1634bde43209db > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sun May 2 10:17:07 2010 -0400 > > Merge branch 'gles2-2' > > Conflicts: > src/mesa/drivers/dri/common/dri_util.h > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fd5fa05122aa0cac0051fa92d1634bde43209db > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sun May 2 10:14:53 2010 -0400 > > Hook in install rules for es1 and es2 > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=74399d4af5b5ea793ce8318c10014a026cf81563 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sun May 2 09:51:13 2010 -0400 > > Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2 > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=a804af2a1ea184ecc2c6a5e77335fae1e7730242 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sun May 2 09:27:51 2010 -0400 > > st/mesa: Create context for API_OPENGL as first priority > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=9339c1291d73ada1a85b994cb076a9a0bf3c8110 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Fri Mar 5 19:01:43 2010 -0500 > > gles: Build libGLESv1_CM.so and libGLESv2.so from glapi files > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5107b0a5cb1ac9f112aa498f57c13580bd56cb3 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 14:57:51 2010 -0400 > > intel: Only register ES2 extensions for ES2 contexts > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f68032a7cebe740421e5de4586d13c99a8728ab > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 13:42:33 2010 -0400 > > configure.ac: Add options to enable GLES1/2 API support > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=5efee4d4e68067a3fd85b9ff6a2636f502538768 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 21:43:40 2010 -0400 > > intel: Advertise GLES1/2 for i915+ when enabled > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b69100bdcf26dbb5be4d600b7ca5f5cdf6e8f20 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 11:04:51 2010 -0400 > > dri: Add DRI entrypoints to create a context for a given API > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2fd98d794947464aa97d85fbbcbd2b833e96939 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 11:38:46 2010 -0400 > > egl_dri2: Use new DRI API to create a GLES1/2 context when asked to > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7a9a91d7b28e5b5faed509d00f0f951e3136b1b > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 11:04:51 2010 -0400 > > dri: Add DRI entrypoints to create a context for a given API > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f5e8f77022f8bb4ac00128af6d217da747e63df > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 10:52:23 2010 -0400 > > st/mesa: Move st_cb_drawtex.c to the mesa state tracker > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bd6e003462e579c6c1b4a62d8e5f26cb314862d > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 09:00:31 2010 -0400 > > es: Drop es specific enums.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=21ad81727c9dfe83dfe7e06937e9142e8e652fba > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 09:00:17 2010 -0400 > > glapi: Regenerate enums.c for all APIs > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=9664f10023b0d57202134ca53795bf40daf580ef > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Tue Apr 27 08:57:56 2010 -0400 > > glapi: Update gl_enum.py to generate enum tables for multiple APIs > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=12c46b15d70ccb6d39d5f5c1a3ddfb0cf929f719 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Mon Apr 26 09:55:41 2010 -0400 > > mesa: Drop unused _mesa_init_drawtex_dispatch() > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=1904ba7936eb5a3fa76875a498eb54f3bd5f90a5 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Mon Apr 26 09:53:23 2010 -0400 > > mesa: Move drawtex functionality to main/ > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=87eb66775949af6e9512daf7e4665c1cfa6b8745 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 20:36:49 2010 -0400 > > mesa: Move glQueryMatrixxOES() implementation to core mesa > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=a73eff645f5203165bf63996a1d60fcab5a6b85e > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 19:56:42 2010 -0400 > > mesa: Move GLES1 texgen functions to texgen.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=7179a822628963d8cfa0817cf072c5acb70638a7 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 19:34:57 2010 -0400 > > mesa: Move support for paletted textures to main/teximage.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=08fae07f5246052dccdd89689e27dc8820a24ff7 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 19:18:35 2010 -0400 > > mesa: Handle GL_TEXTURE_GEN_STR_OES in _mesa_Enable() > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=7aae8a592a299abd881372d3a2850375c2bb8884 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 19:17:54 2010 -0400 > > mesa: Move get_es*.c to main/ > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=003433989597771bbb4f03cf678f5771c09606fd > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Sat Apr 24 16:22:02 2010 -0400 > > es: Prefix the get* functions with _es1/2 so they don't conflict > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=61d94dd207459e0c42d98c9d6eb7df5eabdfd8a4 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 21:11:56 2010 -0400 > > mesa: Move GL_RGB565 workaround into fbobject.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=44f9aef9ee9ceda0659e882afbac4d877267c4fd > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 20:52:21 2010 -0400 > > mesa: Move GLES1/2 vbo entrypoints to vbo_exec_api.c > > This let's us drop stubs.c. > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=c90166fd4fad6bbbeda51a4338bf17d976864188 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 20:34:33 2010 -0400 > > mesa: Move GLES2 shader stubs to main/shaders.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea0c7e71638a4a72a4eae962e6cc471bd33a5605 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 20:26:51 2010 -0400 > > mesa: Move api_exec_es*.c into mesa/main > > This requires renaming a few functions to have unique names so that > they can all live within the same driver. > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=1741ddb747ca0be284315adb4b6fe67ddf292d03 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 13:30:03 2010 -0400 > > mesa: Move references to main/remap_helper.h to api_exec.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa416106307dc193e2133aa6a29b9bcfc91f8b39 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 12:40:47 2010 -0400 > > mesa: Move struct _glapi_table allocation out of context.c > > We now allocate the table from api_exec.c and dlist.c where we fill out > the table. This way, context.c doesn't need to know the actual contents > of struct _glapi_table. > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=ade150d66724259119012420068fa930807311c2 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 11:41:41 2010 -0400 > > mesa: Compute extension string according to API > > We can now stop special casing glGetString() and drop specials_es*.c. > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=18f7e118a5c6dfc04502e6e91ae492bfa33d3cc9 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 08:27:51 2010 -0400 > > es2: Move over es2 code to compute extensions > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=04bf868ad9f0034ce7b726eadd2ffac346441a68 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 08:34:42 2010 -0400 > > main: Report GL_SHADING_LANGUAGE_VERSION according to API > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=29107d4e07144f41614f053aa1fc49ccf225fedf > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Wed Apr 21 16:14:18 2010 -0400 > > mesa: Compute GL version according to API > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=218ceb3e1874a5a28f36a8df3ca0e881cdf213d5 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 11:07:45 2010 -0400 > > mesa: Move API specific context intialization into context.c > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=38d771c0539a087db42d8d940bb2e920bb64598c > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 09:32:11 2010 -0400 > > st/mesa: Use API-aware context constructor > > The mesa state tracker is currently the only place where we create a > context and expect it to implement GLES1/2. Use the API-aware constructor > to communicate this to core mesa. > > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ab18d63cb71d988265eeab431e4363081978144 > Author: Kristian Høgsberg <k...@bitplanet.net> > Date: Thu Apr 22 09:25:51 2010 -0400 > > mesa: Track the OpenGL API we're implementing in the context > > This introduces a new way to create or initialize a context: > > _mesa_create_context_for_api and > _mesa_initialize_context_for_api > > which in addition to the current arguments take an api enum to indicate > which OpenGL API the context should implement. At this point the > API field in GLcontext isn't used anywhere, but later commits will > key certain functionality off of it. > > The _mesa_create_context and _mesa_initialize_context functions are > kept in place as wrappers around the *_for_api versions, passing in > API_OPENGL to get the same behavior as before. > > _______________________________________________ > mesa-commit mailing list > mesa-com...@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-commit _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
