head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.54 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.52 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.50 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.48 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.46 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.44 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.42 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.40 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.38 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.36 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.34 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.32 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.30 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.28 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.26 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.24 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.22 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.20 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.18 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.16 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.14 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.12 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.10 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.8 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.4 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.6 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.2 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.1.0.36 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.34 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.32 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.30 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.28 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.26 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.24 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.22 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.18 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.16 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.14 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.12 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.10 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.8 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.6 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.4 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.2 pkgsrc-2015Q2-base:1.1; locks; strict; comment @// @; 1.2 date 2019.08.21.13.35.28; author nia; state Exp; branches; next 1.1; commitid QbuTYFguNT3eMTzB; 1.1 date 2015.05.16.16.39.52; author tnn; state Exp; branches; next ; commitid c3a2fzxS3fJXQGly; desc @@ 1.2 log @Move graphics/MesaLib18 to graphics/MesaLib. Move graphics/MesaLib to graphics/MesaLib11. @ text @$NetBSD: patch-src_mesa_main_shader__query.cpp,v 1.1 2018/10/07 23:49:31 ryoon Exp $ https://bugs.freedesktop.org/show_bug.cgi?id=66346 From c4a1fec68d2508ff0c4fc2831465aca8c4ca783a Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Wed, 22 Apr 2015 23:04:42 +0100 Subject: [PATCH 1/2] shader_query: convert GLhandleARB to uintptr_t before troncating to GLuint Fixes compiler error on OSX as GLhandleARB is defined as void* if __APPLE__. https://bugs.freedesktop.org/show_bug.cgi?id=66346 --- src/mesa/main/shader_query.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- src/mesa/main/shader_query.cpp.orig 2016-11-10 22:05:17.000000000 +0000 +++ src/mesa/main/shader_query.cpp @@@@ -70,7 +70,12 @@@@ _mesa_BindAttribLocation(GLuint program, GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *const shProg = +#if defined(__APPLE__) + _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glBindAttribLocation"); +#else _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation"); +#endif + if (!shProg) return; @@@@ -114,7 +119,12 @@@@ _mesa_GetActiveAttrib(GLuint program, GL return; } +#if defined(__APPLE__) + shProg = _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glGetActiveAttrib"); +#else shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib"); +#endif + if (!shProg) return; @@@@ -159,7 +169,12 @@@@ _mesa_GetAttribLocation(GLuint program, { GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *const shProg = + +#if defined(__APPLE__) + _mesa_lookup_shader_program_err(ctx, (GLuint)(uintptr_t)program, "glGetAttribLocation"); +#else _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation"); +#endif if (!shProg) { return -1; @ 1.1 log @Fix OSX build errors. patches from FDO bug 66346 and 90249. Reported on IRC by Youri Mouton. @ text @d1 1 a1 1 $NetBSD$ d18 1 a18 3 diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index bc6fec5..22d9e0f 100644 --- src/mesa/main/shader_query.cpp d20 1 a20 1 @@@@ -68,7 +68,7 @@@@ _mesa_BindAttribLocation(GLhandleARB program, GLuint index, d24 1 a24 1 - _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation"); d26 4 d33 1 a33 1 @@@@ -136,7 +136,7 @@@@ _mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index, d37 1 a37 1 - shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib"); d39 4 d46 1 a46 1 @@@@ -250,7 +250,7 @@@@ _mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name) d50 2 a51 1 - _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation"); d53 3 @