grate-driver / mesa

Mesa fork for open-source NVIDIA Tegra20/30 GL implementation
32 stars 15 forks source link

[WIP] Add missing include #5

Closed kwizart closed 6 years ago

kwizart commented 6 years ago

Needed for PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES, etc

Signed-off-by: Nicolas Chauvet kwizart@gmail.com

Additional note: this seems not to fix my build error, so there is probably other missing headers...

kwizart commented 6 years ago

FYI, here is the full log of the compilation: http://koji.rpmfusion.org/kojifiles/work/tasks/6769/196769/build.log

libtool: compile: gcc -DPACKAGE_NAME=\"Mesa\" -DPACKAGE_TARNAME=\"mesa\" -DPACKAGE_VERSION=\"17.3.3\" "-DPACKAGE_STRING=\"Mesa 17.3.3\"" "-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"" -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"17.3.3\" -D_FILE_OFFSET_BITS=64 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_BUILTINBSWAP32=1 -DHAVEBUILTIN_BSWAP64=1 -DHAVE_BUILTINCLZ=1 -DHAVEBUILTIN_CLZLL=1 -DHAVE_BUILTINCTZ=1 -DHAVEBUILTIN_EXPECT=1 -DHAVE_BUILTINFFS=1 -DHAVEBUILTIN_FFSLL=1 -DHAVE_BUILTINPOPCOUNT=1 -DHAVEBUILTIN_POPCOUNTLL=1 -DHAVE_BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1 -DHAVE_FUNC_ATTRIBUTE_FLATTEN=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1 -DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1 -DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL=1 -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 -DHAVE_FUNC_ATTRIBUTE_VISIBILITY=1 -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1 -DHAVE_FUNC_ATTRIBUTE_WEAK=1 -DHAVE_FUNC_ATTRIBUTE_ALIAS=1 -DMAJOR_IN_SYSMACROS=1 -DHAVE_DLADDR=1 -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 -DHAVE_PTHREAD=1 -DHAVE_VALGRIND=1 -I. -I../../../../src/gallium/drivers/tegra/include -I../../../../src/gallium/drivers -I../../../../include -I../../../../include -I../../../../src -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -DSTDC_CONSTANT_MACROS -DSTDC_FORMAT_MACROS -DSTDC_LIMIT_MACROS -D_GNU_SOURCE -DUSE_GCC_ATOMIC_BUILTINS -DNDEBUG -DTEXTURE_FLOAT_ENABLED -DHAVE_SYS_SYSCTL_H -DHAVE_STRTOF -DHAVE_MKOSTEMP -DHAVE_STRTOD_L -DHAVE_DL_ITERATE_PHDR -DHAVE_POSIX_MEMALIGN -DMESA_SELINUX -DUSE_LIBGLVND=1 -DHAVE_LIBDRM -DGLX_USE_DRM -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -DHAVE_X11_PLATFORM -DHAVE_DRM_PLATFORM -DHAVE_SURFACELESS_PLATFORM -DHAVE_WAYLAND_PLATFORM -DWL_HIDE_DEPRECATED -DHAVE_DRI3 -DENABLE_SHADER_CACHE -DHAVE_MINCORE -DHAVE_ST_VDPAU -DHAVE_LLVM=0x0500 -DMESA_LLVM_VERSION_PATCH=1 -I/usr/include/libdrm -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -Wall -Werror=implicit-function-declaration -Werror=missing-prototypes -Wmissing-prototypes -fno-math-errno -fno-trapping-math -std=c99 -c tegra_screen.c -fPIC -DPIC -o .libs/tegra_screen.o make[4]: Leaving directory '/builddir/build/BUILD/mesa-17.3.3/src/gallium/drivers/tegra' tegra_screen.c: In function 'tegra_screen_get_param': tegra_screen.c:332:9: error: 'PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES' undeclared (first use in this function); did you mean 'PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES'? case PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES: ^~~~~~~~~~~~~ PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES tegra_screen.c:332:9: note: each undeclared identifier is reported only once for each function it appears in tegra_screen.c:333:9: error: 'PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET' undeclared (first use in this function); did you mean 'PIPE_CAP_USER_VERTEX_BUFFERS'? case PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET: ^~~~~~~~ PIPE_CAP_USER_VERTEX_BUFFERS tegra_screen.c: In function 'tegra_screen_get_shader_param': tegra_screen.c:444:12: error: 'PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS' undeclared (first use in this function); did you mean 'PIPE_SHADER_CAP_MAX_SHADER_BUFFERS'? case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS: ^~~~~~~~~~ PIPE_SHADER_CAP_MAX_SHADER_BUFFERS tegra_screen.c:445:12: error: 'PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS' undeclared (first use in this function); did you mean 'PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS'? case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS: ^~~~~~~~~~~~~ PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS make[4]: [Makefile:688: tegra_screen.lo] Error 1 make[4]: Waiting for unfinished jobs....

digetx commented 6 years ago

Interresting, launchpad built mesa succefully and it is working fine. Although for ubuntu I've reduced dependencies to minimum and disabled many not-so-useful configure options.

kwizart commented 6 years ago

Okay, seems like theses defines are in 17.3 mesa git, but not in vanilla 17.3.3 release. So it's an issue from my side. Closing.

kwizart commented 6 years ago

Actually, It's even only in 18.0 branch, I've been surprised because the previous commit from the grate tree is about the 17.3.0 hash, whereas this is from an old version of the 18.0 branch, not 17.3.x...

digetx commented 6 years ago

We are currently basing on some random commit from upstream master before it was tagged as 18, so I think it's actually somewhat a bit outdated mesa 18.