aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-19 11:21:45 +0100
committermarha <marha@users.sourceforge.net>2012-11-19 11:21:45 +0100
commit57b3e446b9b4017ccfdd3227be481df590740426 (patch)
tree0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mesa
parent24635abae6008bef13e30d798b3f33abab412770 (diff)
parentb3e1e62c45f525cdd332073aaa34d8452cb23374 (diff)
downloadvcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz
vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2
vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip
Merge remote-tracking branch 'origin/released'
* origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/Android.gen.mk21
-rw-r--r--mesalib/src/mesa/Android.libmesa_dricore.mk67
-rw-r--r--mesalib/src/mesa/Android.libmesa_glsl_utils.mk59
-rw-r--r--mesalib/src/mesa/Android.libmesa_st_mesa.mk65
-rw-r--r--mesalib/src/mesa/Android.mesa_gen_matypes.mk48
-rw-r--r--mesalib/src/mesa/Android.mk135
-rw-r--r--mesalib/src/mesa/Makefile.am28
-rw-r--r--mesalib/src/mesa/SConscript1
-rw-r--r--mesalib/src/mesa/descrip.mms27
-rw-r--r--mesalib/src/mesa/drivers/common/descrip.mms42
-rw-r--r--mesalib/src/mesa/drivers/common/meta.c266
-rw-r--r--mesalib/src/mesa/drivers/dri/common/utils.c22
-rw-r--r--mesalib/src/mesa/drivers/dri/swrast/swrast.c4
-rw-r--r--mesalib/src/mesa/main/api_arrayelt.c32
-rw-r--r--mesalib/src/mesa/main/api_loopback.c854
-rw-r--r--mesalib/src/mesa/main/api_loopback.h416
-rw-r--r--mesalib/src/mesa/main/arbprogram.c10
-rw-r--r--mesalib/src/mesa/main/arbprogram.h6
-rw-r--r--mesalib/src/mesa/main/arrayobj.c4
-rw-r--r--mesalib/src/mesa/main/arrayobj.h4
-rw-r--r--mesalib/src/mesa/main/attrib.c40
-rw-r--r--mesalib/src/mesa/main/blend.c20
-rw-r--r--mesalib/src/mesa/main/blend.h16
-rw-r--r--mesalib/src/mesa/main/bufferobj.c40
-rw-r--r--mesalib/src/mesa/main/bufferobj.h22
-rw-r--r--mesalib/src/mesa/main/buffers.c4
-rw-r--r--mesalib/src/mesa/main/buffers.h2
-rw-r--r--mesalib/src/mesa/main/compiler.h6
-rw-r--r--mesalib/src/mesa/main/descrip.mms258
-rw-r--r--mesalib/src/mesa/main/dlist.c474
-rw-r--r--mesalib/src/mesa/main/drawtex.c12
-rw-r--r--mesalib/src/mesa/main/drawtex.h12
-rw-r--r--mesalib/src/mesa/main/enable.c6
-rw-r--r--mesalib/src/mesa/main/enable.h6
-rw-r--r--mesalib/src/mesa/main/es1_conversion.c100
-rw-r--r--mesalib/src/mesa/main/es1_conversion.h94
-rw-r--r--mesalib/src/mesa/main/fbobject.c54
-rw-r--r--mesalib/src/mesa/main/fbobject.h38
-rw-r--r--mesalib/src/mesa/main/ffvertex_prog.c2
-rw-r--r--mesalib/src/mesa/main/get.c4
-rw-r--r--mesalib/src/mesa/main/get.h4
-rw-r--r--mesalib/src/mesa/main/hash.c371
-rw-r--r--mesalib/src/mesa/main/hash.h4
-rw-r--r--mesalib/src/mesa/main/hash_table.c442
-rw-r--r--mesalib/src/mesa/main/hash_table.h107
-rw-r--r--mesalib/src/mesa/main/imports.c5
-rw-r--r--mesalib/src/mesa/main/imports.h2
-rw-r--r--mesalib/src/mesa/main/light.c2
-rw-r--r--mesalib/src/mesa/main/light.h2
-rw-r--r--mesalib/src/mesa/main/matrix.c8
-rw-r--r--mesalib/src/mesa/main/matrix.h8
-rw-r--r--mesalib/src/mesa/main/mtypes.h3
-rw-r--r--mesalib/src/mesa/main/multisample.c2
-rw-r--r--mesalib/src/mesa/main/multisample.h2
-rw-r--r--mesalib/src/mesa/main/querymatrix.c2
-rw-r--r--mesalib/src/mesa/main/querymatrix.h2
-rw-r--r--mesalib/src/mesa/main/queryobj.c40
-rw-r--r--mesalib/src/mesa/main/queryobj.h20
-rw-r--r--mesalib/src/mesa/main/rastpos.c32
-rw-r--r--mesalib/src/mesa/main/rastpos.h32
-rw-r--r--mesalib/src/mesa/main/readpix.c22
-rw-r--r--mesalib/src/mesa/main/shader_query.cpp6
-rw-r--r--mesalib/src/mesa/main/shaderapi.c36
-rw-r--r--mesalib/src/mesa/main/shaderapi.h18
-rw-r--r--mesalib/src/mesa/main/syncobj.c11
-rw-r--r--mesalib/src/mesa/main/texgetimage.c2
-rw-r--r--mesalib/src/mesa/main/texgetimage.h2
-rw-r--r--mesalib/src/mesa/main/teximage.c54
-rw-r--r--mesalib/src/mesa/main/teximage.h20
-rw-r--r--mesalib/src/mesa/main/texobj.c14
-rw-r--r--mesalib/src/mesa/main/texstate.c4
-rw-r--r--mesalib/src/mesa/main/texstate.h4
-rw-r--r--mesalib/src/mesa/main/texstorage.c4
-rw-r--r--mesalib/src/mesa/main/transformfeedback.c3
-rw-r--r--mesalib/src/mesa/main/transformfeedback.h3
-rw-r--r--mesalib/src/mesa/main/uniform_query.cpp2
-rw-r--r--mesalib/src/mesa/main/uniforms.c44
-rw-r--r--mesalib/src/mesa/main/uniforms.h46
-rw-r--r--mesalib/src/mesa/main/varray.c24
-rw-r--r--mesalib/src/mesa/main/varray.h22
-rw-r--r--mesalib/src/mesa/main/vsnprintf.c165
-rw-r--r--mesalib/src/mesa/math/descrip.mms47
-rwxr-xr-x[-rw-r--r--]mesalib/src/mesa/program/.gitignore1
-rw-r--r--mesalib/src/mesa/program/Android.mk84
-rw-r--r--mesalib/src/mesa/program/Makefile.am57
-rw-r--r--mesalib/src/mesa/program/descrip.mms93
-rw-r--r--mesalib/src/mesa/program/prog_execute.c11
-rw-r--r--mesalib/src/mesa/sources.mak47
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_texture.c100
-rw-r--r--mesalib/src/mesa/state_tracker/st_gen_mipmap.c28
-rw-r--r--mesalib/src/mesa/swrast/descrip.mms82
-rw-r--r--mesalib/src/mesa/swrast_setup/descrip.mms42
-rw-r--r--mesalib/src/mesa/tnl/descrip.mms68
-rw-r--r--mesalib/src/mesa/vbo/descrip.mms62
94 files changed, 2663 insertions, 2976 deletions
diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk
index ce6d65bbd..5f0d73cff 100644
--- a/mesalib/src/mesa/Android.gen.mk
+++ b/mesalib/src/mesa/Android.gen.mk
@@ -32,9 +32,6 @@ intermediates := $(call local-intermediates-dir)
# This is the list of auto-generated files: sources and headers
sources := \
main/enums.c \
- main/api_exec.c \
- program/program_parse.tab.c \
- program/lex.yy.c \
main/dispatch.h \
main/remap_helper.h \
main/get_hash.h
@@ -62,30 +59,12 @@ dispatch_deps := \
$(wildcard $(glapi)/*.py) \
$(wildcard $(glapi)/*.xml)
-define local-l-to-c
- @mkdir -p $(dir $@)
- @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"
- $(hide) $(LEX) -o$@ $<
-endef
-
-define mesa_local-y-to-c-and-h
- @mkdir -p $(dir $@)
- @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
- $(hide) $(YACC) -o $@ -p "_mesa_program_" $<
-endef
-
define es-gen
@mkdir -p $(dir $@)
@echo "Gen ES: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@
endef
-$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
- $(mesa_local-y-to-c-and-h)
-
-$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l
- $(local-l-to-c)
-
$(intermediates)/main/git_sha1.h:
@mkdir -p $(dir $@)
@echo "GIT-SHA1: $(PRIVATE_MODULE) <= git"
diff --git a/mesalib/src/mesa/Android.libmesa_dricore.mk b/mesalib/src/mesa/Android.libmesa_dricore.mk
new file mode 100644
index 000000000..093d7a189
--- /dev/null
+++ b/mesalib/src/mesa/Android.libmesa_dricore.mk
@@ -0,0 +1,67 @@
+# Copyright 2012 Intel Corporation
+# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# ----------------------------------------------------------------------
+# libmesa_dricore.a
+# ----------------------------------------------------------------------
+
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
+
+LOCAL_PATH := $(call my-dir)
+
+# Import the following variables:
+# MESA_FILES
+# X86_FILES
+include $(LOCAL_PATH)/sources.mak
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_dricore
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+MESA_ENABLED_APIS := ES1 ES2 GL
+
+LOCAL_SRC_FILES := \
+ $(MESA_FILES)
+
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+ifeq ($(TARGET_ARCH),x86)
+ LOCAL_SRC_FILES += $(X86_FILES)
+endif # x86
+endif # MESA_ENABLE_ASM
+
+LOCAL_CFLAGS := \
+ $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
+
+LOCAL_C_INCLUDES := \
+ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
+ $(MESA_TOP)/src/mapi \
+ $(MESA_TOP)/src/glsl
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libmesa_program
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_BUILD_CLASSIC
diff --git a/mesalib/src/mesa/Android.libmesa_glsl_utils.mk b/mesalib/src/mesa/Android.libmesa_glsl_utils.mk
new file mode 100644
index 000000000..480275795
--- /dev/null
+++ b/mesalib/src/mesa/Android.libmesa_glsl_utils.mk
@@ -0,0 +1,59 @@
+# Copyright 2012 Intel Corporation
+# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+LOCAL_PATH := $(call my-dir)
+
+#
+# The libmesa_glsl_utils libraries allow us to avoid a circular dependency
+# between core mesa and glsl.
+#
+
+# ---------------------------------------
+# libmesa_glsl_utils.a for target
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_glsl_utils
+
+LOCAL_SRC_FILES := \
+ program/hash_table.c \
+ program/symbol_table.c
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+# ---------------------------------------
+# libmesa_glsl_utils.a for host
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_glsl_utils
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := \
+ program/hash_table.c \
+ program/symbol_table.c
+
+include $(MESA_COMMON_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/mesalib/src/mesa/Android.libmesa_st_mesa.mk b/mesalib/src/mesa/Android.libmesa_st_mesa.mk
new file mode 100644
index 000000000..79914caf1
--- /dev/null
+++ b/mesalib/src/mesa/Android.libmesa_st_mesa.mk
@@ -0,0 +1,65 @@
+# Copyright 2012 Intel Corporation
+# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# ----------------------------------------------------------------------
+# libmesa_st_mesa.a
+# ----------------------------------------------------------------------
+
+ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
+
+LOCAL_PATH := $(call my-dir)
+
+# Import variables:
+# MESA_GALLIUM_FILES.
+# X86_FILES
+include $(LOCAL_PATH)/sources.mak
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_st_mesa
+
+MESA_ENABLED_APIS := ES1 ES2
+
+LOCAL_SRC_FILES := \
+ $(MESA_GALLIUM_FILES)
+
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+ifeq ($(TARGET_ARCH),x86)
+ LOCAL_SRC_FILES += $(X86_FILES)
+endif # x86
+endif # MESA_ENABLE_ASM
+
+LOCAL_C_INCLUDES := \
+ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/src/gallium/include \
+ $(MESA_TOP)/src/glsl \
+ $(MESA_TOP)/src/mapi
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libmesa_program
+
+include $(LOCAL_PATH)/Android.gen.mk
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_BUILD_GALLIUM
diff --git a/mesalib/src/mesa/Android.mesa_gen_matypes.mk b/mesalib/src/mesa/Android.mesa_gen_matypes.mk
new file mode 100644
index 000000000..6e301f904
--- /dev/null
+++ b/mesalib/src/mesa/Android.mesa_gen_matypes.mk
@@ -0,0 +1,48 @@
+# Copyright 2012 Intel Corporation
+# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
+# Copyright (C) 2010-2011 LunarG Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# ---------------------------------------------------------------------
+# host executable: mesa_gen_matypes
+# ---------------------------------------------------------------------
+
+ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+ifeq ($(TARGET_ARCH),x86)
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := mesa_gen_matypes
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src/mapi \
+ $(MESA_TOP)/src/glsl
+
+LOCAL_SRC_FILES := \
+ x86/gen_matypes.c
+
+include $(MESA_COMMON_MK)
+include $(BUILD_HOST_EXECUTABLE)
+
+endif # x86
+endif # MESA_ENABLE_ASM
diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk
index c32b1c0c1..20f781948 100644
--- a/mesalib/src/mesa/Android.mk
+++ b/mesalib/src/mesa/Android.mk
@@ -1,7 +1,4 @@
-# Mesa 3-D graphics library
-#
-# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 2010-2011 LunarG Inc.
+# Copyright 2012 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -21,131 +18,11 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-# Android.mk for core mesa
-
LOCAL_PATH := $(call my-dir)
-# Import the following variables:
-# MESA_CXX_FILES
-# MESA_GALLIUM_CXX_FILES
-# MESA_GALLIUM_FILES
-# MESA_FILES
-# X86_FILES
-include $(LOCAL_PATH)/sources.mak
-
-MESA_ENABLED_APIS := ES1 ES2
-
-common_C_INCLUDES := \
- $(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/glsl
-
-common_ASM :=
-
-# ---------------------------------------
-# Build mesa_gen_matypes for host
-# ---------------------------------------
-
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
-ifeq ($(TARGET_ARCH),x86)
-common_ASM += $(X86_FILES)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := x86/gen_matypes.c
-LOCAL_CFLAGS := $(common_CFLAGS)
-LOCAL_C_INCLUDES := $(common_C_INCLUDES)
-LOCAL_MODULE := mesa_gen_matypes
-LOCAL_IS_HOST_MODULE := true
-include $(MESA_COMMON_MK)
-include $(BUILD_HOST_EXECUTABLE)
-
-endif # x86
-endif # MESA_ENABLE_ASM
-
-# ---------------------------------------
-# Build libmesa_st_mesa
-# ---------------------------------------
-
-ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- $(MESA_GALLIUM_FILES) \
- $(MESA_GALLIUM_CXX_FILES) \
- $(common_ASM)
-
-LOCAL_CFLAGS := $(common_CFLAGS)
-
-LOCAL_C_INCLUDES := \
- $(common_C_INCLUDES) \
- $(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
-
-LOCAL_MODULE := libmesa_st_mesa
-
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_GALLIUM
-
-# ---------------------------------------
-# Build libmesa_dricore for DRI modules
-# ---------------------------------------
-
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libmesa_dricore
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-MESA_ENABLED_APIS += GL
-LOCAL_CFLAGS := \
- $(common_CFLAGS) \
- $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
-
-LOCAL_C_INCLUDES := \
- $(common_C_INCLUDES)
-
-LOCAL_SRC_FILES := \
- $(MESA_FILES) \
- $(MESA_CXX_FILES) \
- $(common_ASM)
-
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-endif # MESA_BUILD_CLASSIC
-
-# ---------------------------------------
-# Build libmesa_glsl_utils
-#
-# It is used to avoid circular dependency between core mesa and glsl.
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- program/hash_table.c \
- program/symbol_table.c
-
-LOCAL_MODULE := libmesa_glsl_utils
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build libmesa_glsl_utils for host
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- program/hash_table.c \
- program/symbol_table.c
-
-LOCAL_MODULE := libmesa_glsl_utils
-LOCAL_IS_HOST_MODULE := true
+include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk
+include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
+include $(LOCAL_PATH)/Android.libmesa_dricore.mk
+include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(LOCAL_PATH)/program/Android.mk
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am
index 1f897257e..9809ee437 100644
--- a/mesalib/src/mesa/Makefile.am
+++ b/mesalib/src/mesa/Makefile.am
@@ -23,7 +23,7 @@ if NEED_LIBDRICORE
DRICORE_SUBDIR = libdricore
endif
-SUBDIRS = x86 x86-64 . $(DRICORE_SUBDIR) drivers
+SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) drivers
gldir = $(includedir)/GL
gl_HEADERS = $(top_srcdir)/include/GL/*.h
@@ -53,22 +53,11 @@ include $(GLAPI)/glapi_gen.mk
BUILT_SOURCES = \
main/git_sha1.h \
- main/get_hash.h \
- program/program_parse.tab.c \
- program/program_parse.tab.h \
- program/lex.yy.c
+ main/get_hash.h
CLEANFILES = \
$(BUILT_SOURCES) \
git_sha1.h.tmp
-program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
- $(MKDIR_P) program
- $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
-
-program/lex.yy.c: program/program_lexer.l
- $(MKDIR_P) program
- $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
-
GET_HASH_GEN = main/get_hash_generator.py
GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, \
$(patsubst -DFEATURE_%=0,,$(API_DEFINES)))
@@ -122,18 +111,23 @@ endif
libmesa_la_SOURCES = \
$(MESA_FILES) \
- $(MESA_CXX_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+libmesa_la_LIBADD = \
+ $(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/mesa/program/libprogram.la \
+ $()
libmesa_la_LDFLAGS =
libmesagallium_la_SOURCES = \
$(MESA_GALLIUM_FILES) \
- $(MESA_GALLIUM_CXX_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
-libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+libmesagallium_la_LIBADD = \
+ $(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/mesa/program/libprogram.la \
+ $()
+
libmesagallium_la_LDFLAGS =
if HAVE_GALLIUM
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 4c3355bd9..be1ed5f60 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -81,6 +81,7 @@ main_sources = [
'main/getstring.c',
'main/glformats.c',
'main/hash.c',
+ 'main/hash_table.c',
'main/hint.c',
'main/histogram.c',
'main/image.c',
diff --git a/mesalib/src/mesa/descrip.mms b/mesalib/src/mesa/descrip.mms
deleted file mode 100644
index dbfa336a9..000000000
--- a/mesalib/src/mesa/descrip.mms
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile for Mesa for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Date last revision : 7 March 2007
-
-all :
- set default [.main]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.glapi]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.shader]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.drivers.common]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.x11]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.osmesa]
- $(MMS)$(MMSQUALIFIERS)
- set default [--.math]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.tnl]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.swrast]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.swrast_setup]
- $(MMS)$(MMSQUALIFIERS)
- set default [-.vbo]
- $(MMS)$(MMSQUALIFIERS)
diff --git a/mesalib/src/mesa/drivers/common/descrip.mms b/mesalib/src/mesa/drivers/common/descrip.mms
deleted file mode 100644
index d5bbc69df..000000000
--- a/mesalib/src/mesa/drivers/common/descrip.mms
+++ /dev/null
@@ -1,42 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 29 September 2008
-
-.first
- define gl [----.include.gl]
- define math [--.math]
- define tnl [--.tnl]
- define swrast [--.swrast]
- define glapi [--.glapi]
- define shader [--.shader]
- define main [--.main]
-
-.include [----]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
-LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)\
- /float=ieee/ieee=denorm/warn=disable=(PTRMISMATCH)
-
-SOURCES = driverfuncs.c
-
-OBJECTS =driverfuncs.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-driverfuncs.obj : driverfuncs.c
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 1f2a8a696..417dbd041 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -356,8 +356,8 @@ compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB
GLchar *info;
shader = _mesa_CreateShaderObjectARB(target);
- _mesa_ShaderSourceARB(shader, 1, &source, NULL);
- _mesa_CompileShaderARB(shader);
+ _mesa_ShaderSource(shader, 1, &source, NULL);
+ _mesa_CompileShader(shader);
_mesa_GetShaderiv(shader, GL_COMPILE_STATUS, &ok);
if (ok)
@@ -393,7 +393,7 @@ link_program_with_debug(struct gl_context *ctx, GLuint program)
GLint ok, size;
GLchar *info;
- _mesa_LinkProgramARB(program);
+ _mesa_LinkProgram(program);
_mesa_GetProgramiv(program, GL_LINK_STATUS, &ok);
if (ok)
@@ -604,7 +604,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_reference_shader_program(ctx, &save->ActiveShader,
ctx->Shader.ActiveProgram);
- _mesa_UseProgramObjectARB(0);
+ _mesa_UseProgram(0);
}
}
@@ -629,7 +629,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled;
if (ctx->Texture.Unit[u].Enabled ||
ctx->Texture.Unit[u].TexGenEnabled) {
- _mesa_ActiveTextureARB(GL_TEXTURE0 + u);
+ _mesa_ActiveTexture(GL_TEXTURE0 + u);
_mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE);
if (ctx->Extensions.ARB_texture_cube_map)
_mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
@@ -659,8 +659,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
}
/* set defaults for unit[0] */
- _mesa_ActiveTextureARB(GL_TEXTURE0);
- _mesa_ClientActiveTextureARB(GL_TEXTURE0);
+ _mesa_ActiveTexture(GL_TEXTURE0);
+ _mesa_ClientActiveTexture(GL_TEXTURE0);
if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) {
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
}
@@ -676,10 +676,10 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
16 * sizeof(GLfloat));
save->MatrixMode = ctx->Transform.MatrixMode;
/* set 1:1 vertex:pixel coordinate transform */
- _mesa_ActiveTextureARB(GL_TEXTURE0);
+ _mesa_ActiveTexture(GL_TEXTURE0);
_mesa_MatrixMode(GL_TEXTURE);
_mesa_LoadIdentity();
- _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
+ _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture);
_mesa_MatrixMode(GL_MODELVIEW);
_mesa_LoadIdentity();
_mesa_MatrixMode(GL_PROJECTION);
@@ -737,7 +737,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
* regardless of the internal implementation of the metaops.
*/
if (ctx->Color.ClampFragmentColor != GL_TRUE)
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
+ _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
if (state & MESA_META_CLAMP_VERTEX_COLOR) {
@@ -746,7 +746,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
/* Generally in here we never want vertex color clamping --
* result clamping is only dependent on fragment clamping.
*/
- _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, GL_FALSE);
+ _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, GL_FALSE);
}
if (state & MESA_META_CONDITIONAL_RENDER) {
@@ -832,7 +832,7 @@ _mesa_meta_end(struct gl_context *ctx)
save->ColorMask[i][2], save->ColorMask[i][3]);
}
else {
- _mesa_ColorMaskIndexed(i,
+ _mesa_ColorMaski(i,
save->ColorMask[i][0],
save->ColorMask[i][1],
save->ColorMask[i][2],
@@ -1001,16 +1001,16 @@ _mesa_meta_end(struct gl_context *ctx)
}
/* restore current unit state */
- _mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit);
- _mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit);
+ _mesa_ActiveTexture(GL_TEXTURE0 + save->ActiveUnit);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + save->ClientActiveUnit);
}
if (state & MESA_META_TRANSFORM) {
GLuint activeTexture = ctx->Texture.CurrentUnit;
- _mesa_ActiveTextureARB(GL_TEXTURE0);
+ _mesa_ActiveTexture(GL_TEXTURE0);
_mesa_MatrixMode(GL_TEXTURE);
_mesa_LoadMatrixf(save->TextureMatrix);
- _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
+ _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture);
_mesa_MatrixMode(GL_MODELVIEW);
_mesa_LoadMatrixf(save->ModelviewMatrix);
@@ -1034,7 +1034,7 @@ _mesa_meta_end(struct gl_context *ctx)
if (state & MESA_META_VERTEX) {
/* restore vertex buffer object */
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
_mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL);
/* restore vertex array object */
@@ -1054,11 +1054,11 @@ _mesa_meta_end(struct gl_context *ctx)
}
if (state & MESA_META_CLAMP_FRAGMENT_COLOR) {
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor);
+ _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor);
}
if (state & MESA_META_CLAMP_VERTEX_COLOR) {
- _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor);
+ _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor);
}
if (state & MESA_META_CONDITIONAL_RENDER) {
@@ -1326,12 +1326,12 @@ setup_drawpix_texture(struct gl_context *ctx,
_mesa_reference_buffer_object(ctx, &save_unpack_obj,
ctx->Unpack.BufferObj);
- _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+ _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
/* create empty texture */
_mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
tex->Width, tex->Height, 0, format, type, NULL);
if (save_unpack_obj != NULL)
- _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB,
+ _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,
save_unpack_obj->Name);
/* load image */
_mesa_TexSubImage2D(tex->Target, 0,
@@ -1372,8 +1372,8 @@ init_blit_depth_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
- _mesa_GenPrograms(1, &blit->DepthFP);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
+ _mesa_GenProgramsARB(1, &blit->DepthFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@@ -1498,7 +1498,7 @@ blitframebuffer_texture(struct gl_context *ctx,
verts[3].s = s0;
verts[3].t = t1;
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
@@ -1583,9 +1583,9 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
_mesa_BindVertexArray(blit->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &blit->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &blit->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@@ -1596,7 +1596,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(blit->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO);
}
/* Try faster, direct texture approach first */
@@ -1634,7 +1634,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
verts[3].t = tex->Ttop;
/* upload new vertex data */
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_set_enable(ctx, tex->Target, GL_TRUE);
@@ -1661,7 +1661,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH,
GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
_mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
_mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);
@@ -1693,13 +1693,13 @@ static void
meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit)
{
if (blit->ArrayObj) {
- _mesa_DeleteVertexArraysAPPLE(1, &blit->ArrayObj);
+ _mesa_DeleteVertexArrays(1, &blit->ArrayObj);
blit->ArrayObj = 0;
- _mesa_DeleteBuffersARB(1, &blit->VBO);
+ _mesa_DeleteBuffers(1, &blit->VBO);
blit->VBO = 0;
}
if (blit->DepthFP) {
- _mesa_DeletePrograms(1, &blit->DepthFP);
+ _mesa_DeleteProgramsARB(1, &blit->DepthFP);
blit->DepthFP = 0;
}
}
@@ -1739,8 +1739,8 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
_mesa_BindVertexArray(clear->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &clear->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+ _mesa_GenBuffers(1, &clear->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* setup vertex arrays */
_mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
@@ -1750,7 +1750,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
}
else {
_mesa_BindVertexArray(clear->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
}
/* GL_COLOR_BUFFER_BIT */
@@ -1758,7 +1758,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
/* leave colormask, glDrawBuffer state as-is */
/* Clears never have the color clamped. */
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
+ _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
else {
ASSERT(metaSave & MESA_META_COLOR_MASK);
@@ -1819,7 +1819,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
}
/* upload new vertex data */
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
GL_DYNAMIC_DRAW_ARB);
}
@@ -1870,30 +1870,30 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
_mesa_BindVertexArray(clear->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &clear->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+ _mesa_GenBuffers(1, &clear->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* setup vertex arrays */
- _mesa_VertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0);
- _mesa_EnableVertexAttribArrayARB(0);
+ _mesa_VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0);
+ _mesa_EnableVertexAttribArray(0);
vs = _mesa_CreateShaderObjectARB(GL_VERTEX_SHADER);
- _mesa_ShaderSourceARB(vs, 1, &vs_source, NULL);
- _mesa_CompileShaderARB(vs);
+ _mesa_ShaderSource(vs, 1, &vs_source, NULL);
+ _mesa_CompileShader(vs);
fs = _mesa_CreateShaderObjectARB(GL_FRAGMENT_SHADER);
- _mesa_ShaderSourceARB(fs, 1, &fs_source, NULL);
- _mesa_CompileShaderARB(fs);
+ _mesa_ShaderSource(fs, 1, &fs_source, NULL);
+ _mesa_CompileShader(fs);
clear->ShaderProg = _mesa_CreateProgramObjectARB();
_mesa_AttachShader(clear->ShaderProg, fs);
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(clear->ShaderProg, vs);
_mesa_DeleteObjectARB(vs);
- _mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position");
- _mesa_LinkProgramARB(clear->ShaderProg);
+ _mesa_BindAttribLocation(clear->ShaderProg, 0, "position");
+ _mesa_LinkProgram(clear->ShaderProg);
- clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg,
+ clear->ColorLocation = _mesa_GetUniformLocation(clear->ShaderProg,
"color");
if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) {
@@ -1905,7 +1905,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(clear->IntegerShaderProg, vs);
_mesa_DeleteObjectARB(vs);
- _mesa_BindAttribLocationARB(clear->IntegerShaderProg, 0, "position");
+ _mesa_BindAttribLocation(clear->IntegerShaderProg, 0, "position");
/* Note that user-defined out attributes get automatically assigned
* locations starting from 0, so we don't need to explicitly
@@ -1915,7 +1915,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
link_program_with_debug(ctx, clear->IntegerShaderProg);
clear->IntegerColorLocation =
- _mesa_GetUniformLocationARB(clear->IntegerShaderProg, "color");
+ _mesa_GetUniformLocation(clear->IntegerShaderProg, "color");
}
}
@@ -1924,9 +1924,9 @@ meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear)
{
if (clear->ArrayObj == 0)
return;
- _mesa_DeleteVertexArraysAPPLE(1, &clear->ArrayObj);
+ _mesa_DeleteVertexArrays(1, &clear->ArrayObj);
clear->ArrayObj = 0;
- _mesa_DeleteBuffersARB(1, &clear->VBO);
+ _mesa_DeleteBuffers(1, &clear->VBO);
clear->VBO = 0;
_mesa_DeleteObjectARB(clear->ShaderProg);
clear->ShaderProg = 0;
@@ -1980,24 +1980,24 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers)
meta_glsl_clear_init(ctx, clear);
if (fb->_IntegerColor) {
- _mesa_UseProgramObjectARB(clear->IntegerShaderProg);
- _mesa_Uniform4ivARB(clear->IntegerColorLocation, 1,
+ _mesa_UseProgram(clear->IntegerShaderProg);
+ _mesa_Uniform4iv(clear->IntegerColorLocation, 1,
ctx->Color.ClearColor.i);
} else {
- _mesa_UseProgramObjectARB(clear->ShaderProg);
- _mesa_Uniform4fvARB(clear->ColorLocation, 1,
+ _mesa_UseProgram(clear->ShaderProg);
+ _mesa_Uniform4fv(clear->ColorLocation, 1,
ctx->Color.ClearColor.f);
}
_mesa_BindVertexArray(clear->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* GL_COLOR_BUFFER_BIT */
if (buffers & BUFFER_BITS_COLOR) {
/* leave colormask, glDrawBuffer state as-is */
/* Clears never have the color clamped. */
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
+ _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
else {
ASSERT(metaSave & MESA_META_COLOR_MASK);
@@ -2042,7 +2042,7 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers)
verts[3].z = z;
/* upload new vertex data */
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
GL_DYNAMIC_DRAW_ARB);
/* draw quad */
@@ -2098,9 +2098,9 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
_mesa_BindVertexArray(copypix->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &copypix->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &copypix->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@@ -2111,7 +2111,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
}
else {
_mesa_BindVertexArray(copypix->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO);
}
newTex = alloc_texture(tex, width, height, intFormat);
@@ -2146,7 +2146,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
verts[3].t = tex->Ttop;
/* upload new vertex data */
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
/* Alloc/setup texture */
@@ -2260,8 +2260,8 @@ init_draw_stencil_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
- _mesa_GenPrograms(1, &drawpix->StencilFP);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
+ _mesa_GenProgramsARB(1, &drawpix->StencilFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@@ -2294,8 +2294,8 @@ init_draw_depth_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
- _mesa_GenPrograms(1, &drawpix->DepthFP);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
+ _mesa_GenProgramsARB(1, &drawpix->DepthFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@@ -2452,9 +2452,9 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
_mesa_BindVertexArray(drawpix->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &vbo);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &vbo);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, vbo);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
verts, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@@ -2490,7 +2490,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
/* set stencil bits to 1 where needed */
_mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) {
@@ -2511,7 +2511,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
if (!drawpix->DepthFP)
init_draw_depth_pixels(ctx);
- _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
+ _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
/* polygon color = current raster color */
@@ -2532,7 +2532,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
_mesa_set_enable(ctx, tex->Target, GL_FALSE);
- _mesa_DeleteBuffersARB(1, &vbo);
+ _mesa_DeleteBuffers(1, &vbo);
/* restore unpack params */
ctx->Unpack = unpackSave;
@@ -2629,9 +2629,9 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
_mesa_BindVertexArrayAPPLE(bitmap->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &bitmap->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &bitmap->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@@ -2644,7 +2644,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(bitmap->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
}
newTex = alloc_texture(tex, width, height, texIntFormat);
@@ -2687,7 +2687,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
}
/* upload new vertex data */
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
/* choose different foreground/background alpha values */
@@ -2770,11 +2770,11 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
* Test that we can actually render in the texture's format.
*/
if (!mipmap->FBO)
- _mesa_GenFramebuffersEXT(1, &mipmap->FBO);
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
+ _mesa_GenFramebuffers(1, &mipmap->FBO);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
if (target == GL_TEXTURE_1D) {
- _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel);
}
@@ -2782,21 +2782,21 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
/* other work is needed to enable 3D mipmap generation */
else if (target == GL_TEXTURE_3D) {
GLint zoffset = 0;
- _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel, zoffset);
}
#endif
else {
/* 2D / cube */
- _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel);
}
- status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
return GL_TRUE;
@@ -2975,8 +2975,8 @@ setup_ff_generate_mipmap(struct gl_context *ctx,
_mesa_BindVertexArrayAPPLE(mipmap->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &mipmap->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
+ _mesa_GenBuffers(1, &mipmap->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
/* setup vertex arrays */
_mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
_mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(tex));
@@ -3058,13 +3058,13 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
_mesa_BindVertexArray(mipmap->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &mipmap->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
+ _mesa_GenBuffers(1, &mipmap->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
/* setup vertex arrays */
- _mesa_VertexAttribPointerARB(0, 2, GL_FLOAT, GL_FALSE,
+ _mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE,
sizeof(struct vertex), OFFSET(x));
- _mesa_VertexAttribPointerARB(1, 3, GL_FLOAT, GL_FALSE,
+ _mesa_VertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
sizeof(struct vertex), OFFSET(tex));
}
@@ -3133,10 +3133,10 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(mipmap->ShaderProg, vs);
_mesa_DeleteObjectARB(vs);
- _mesa_BindAttribLocationARB(mipmap->ShaderProg, 0, "position");
- _mesa_BindAttribLocationARB(mipmap->ShaderProg, 1, "texcoords");
- _mesa_EnableVertexAttribArrayARB(0);
- _mesa_EnableVertexAttribArrayARB(1);
+ _mesa_BindAttribLocation(mipmap->ShaderProg, 0, "position");
+ _mesa_BindAttribLocation(mipmap->ShaderProg, 1, "texcoords");
+ _mesa_EnableVertexAttribArray(0);
+ _mesa_EnableVertexAttribArray(1);
link_program_with_debug(ctx, mipmap->ShaderProg);
sampler->shader_prog = mipmap->ShaderProg;
ralloc_free(mem_ctx);
@@ -3149,9 +3149,9 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx,
{
if (mipmap->ArrayObj == 0)
return;
- _mesa_DeleteVertexArraysAPPLE(1, &mipmap->ArrayObj);
+ _mesa_DeleteVertexArrays(1, &mipmap->ArrayObj);
mipmap->ArrayObj = 0;
- _mesa_DeleteBuffersARB(1, &mipmap->VBO);
+ _mesa_DeleteBuffers(1, &mipmap->VBO);
mipmap->VBO = 0;
_mesa_DeleteObjectARB(mipmap->sampler_1d.shader_prog);
@@ -3219,7 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
*/
if (use_glsl_version) {
setup_glsl_generate_mipmap(ctx, mipmap, target);
- _mesa_UseProgramObjectARB(mipmap->ShaderProg);
+ _mesa_UseProgram(mipmap->ShaderProg);
}
else {
setup_ff_generate_mipmap(ctx, mipmap);
@@ -3227,7 +3227,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
_mesa_BindVertexArray(mipmap->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ?
ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0;
@@ -3236,7 +3236,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_BindTexture(target, texObj->Name);
if (!mipmap->FBO) {
- _mesa_GenFramebuffersEXT(1, &mipmap->FBO);
+ _mesa_GenFramebuffers(1, &mipmap->FBO);
}
if (!mipmap->Sampler) {
@@ -3264,7 +3264,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
}
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES)
_mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
@@ -3291,7 +3291,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
verts[3].y = 1.0F;
/* upload vertex data */
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
verts, GL_DYNAMIC_DRAW_ARB);
/* texture is already locked, unlock now */
@@ -3345,7 +3345,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
/* Set to draw into the current dstLevel */
if (target == GL_TEXTURE_1D) {
- _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target,
texObj->Name,
@@ -3353,7 +3353,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
else if (target == GL_TEXTURE_3D) {
GLint zoffset = 0; /* XXX unfinished */
- _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target,
texObj->Name,
@@ -3361,7 +3361,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
else {
/* 2D / cube */
- _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
faceTarget,
texObj->Name,
@@ -3371,7 +3371,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
/* sanity check */
- status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+ status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_problem(ctx, "Unexpected incomplete framebuffer in "
"_mesa_meta_GenerateMipmap()");
@@ -3397,7 +3397,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
if (genMipmapSave)
_mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
}
@@ -3574,23 +3574,23 @@ decompress_texture_image(struct gl_context *ctx,
/* Create/bind FBO/renderbuffer */
if (decompress->FBO == 0) {
- _mesa_GenFramebuffersEXT(1, &decompress->FBO);
- _mesa_GenRenderbuffersEXT(1, &decompress->RBO);
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO);
- _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO);
- _mesa_FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
+ _mesa_GenFramebuffers(1, &decompress->FBO);
+ _mesa_GenRenderbuffers(1, &decompress->RBO);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO);
+ _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO);
+ _mesa_FramebufferRenderbuffer(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
GL_RENDERBUFFER_EXT,
decompress->RBO);
}
else {
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO);
}
/* alloc dest surface */
if (width > decompress->Width || height > decompress->Height) {
- _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO);
- _mesa_RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA,
+ _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO);
+ _mesa_RenderbufferStorage(GL_RENDERBUFFER_EXT, GL_RGBA,
width, height);
decompress->Width = width;
decompress->Height = height;
@@ -3603,9 +3603,9 @@ decompress_texture_image(struct gl_context *ctx,
_mesa_BindVertexArray(decompress->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &decompress->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &decompress->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@@ -3616,7 +3616,7 @@ decompress_texture_image(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(decompress->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO);
}
if (!decompress->Sampler) {
@@ -3652,7 +3652,7 @@ decompress_texture_image(struct gl_context *ctx,
verts[3].y = height;
/* upload new vertex data */
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
/* setup texture state */
_mesa_BindTexture(target, texObj->Name);
@@ -3713,13 +3713,13 @@ decompress_texture_image(struct gl_context *ctx,
/* restore fbo bindings */
if (fboDrawSave == fboReadSave) {
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboDrawSave);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboDrawSave);
}
else {
- _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave);
- _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fboReadSave);
+ _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave);
+ _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, fboReadSave);
}
- _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, rbSave);
+ _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, rbSave);
}
@@ -3784,9 +3784,9 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
_mesa_BindVertexArray(drawtex->ArrayObj);
/* create vertex array buffer */
- _mesa_GenBuffersARB(1, &drawtex->VBO);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
- _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+ _mesa_GenBuffers(1, &drawtex->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
+ _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* client active texture is not part of the array object */
@@ -3796,17 +3796,17 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
_mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
_mesa_EnableClientState(GL_VERTEX_ARRAY);
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
- _mesa_ClientActiveTextureARB(GL_TEXTURE0 + i);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + i);
_mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(st[i]));
_mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
}
/* restore client active texture */
- _mesa_ClientActiveTextureARB(GL_TEXTURE0 + active_texture);
+ _mesa_ClientActiveTexture(GL_TEXTURE0 + active_texture);
}
else {
_mesa_BindVertexArray(drawtex->ArrayObj);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
}
/* vertex positions, texcoords */
@@ -3871,7 +3871,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
verts[3].st[i][1] = t1;
}
- _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
+ _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index 3e99f3d1e..062712bf3 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -149,13 +149,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
* If the function fails and returns \c GL_FALSE, this
* value will be unmodified, but some elements in the
* linked list may be modified.
- * \param fb_format Format of the framebuffer. Currently only \c GL_RGB,
- * \c GL_RGBA, \c GL_BGR, and \c GL_BGRA are supported.
- * \param fb_type Type of the pixels in the framebuffer. Currently only
- * \c GL_UNSIGNED_SHORT_5_6_5,
- * \c GL_UNSIGNED_SHORT_5_6_5_REV,
- * \c GL_UNSIGNED_INT_8_8_8_8, and
- * \c GL_UNSIGNED_INT_8_8_8_8_REV are supported.
+ * \param format Mesa gl_format enum describing the pixel format
* \param depth_bits Array of depth buffer sizes to be exposed.
* \param stencil_bits Array of stencil buffer sizes to be exposed.
* \param num_depth_stencil_bits Number of entries in both \c depth_bits and
@@ -174,16 +168,10 @@ driGetRendererString( char * buffer, const char * hardware_name,
* \c GLX_DIRECT_COLOR.
*
* \returns
- * \c GL_TRUE on success or \c GL_FALSE on failure. Currently the only
- * cause of failure is a bad parameter (i.e., unsupported \c fb_format or
- * \c fb_type).
- *
- * \todo
- * There is currently no way to support packed RGB modes (i.e., modes with
- * exactly 3 bytes per pixel) or floating-point modes. This could probably
- * be done by creating some new, private enums with clever names likes
- * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32,
- * \c GL_4HALF_16_16_16_16, etc. We can cross that bridge when we come to it.
+ * Pointer to any array of pointers to the \c __DRIconfig structures created
+ * for the specified formats. If there is an error, \c NULL is returned.
+ * Currently the only cause of failure is a bad parameter (i.e., unsupported
+ * \c format).
*/
__DRIconfig **
driCreateConfigs(gl_format format,
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index f6c6133e3..207a84340 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -197,18 +197,16 @@ swrastFillInModes(__DRIscreen *psp,
static const __DRIconfig **
dri_init_screen(__DRIscreen * psp)
{
- __DRIconfig **configs8, **configs16, **configs24, **configs32;
+ __DRIconfig **configs16, **configs24, **configs32;
TRACE;
psp->extensions = dri_screen_extensions;
- configs8 = swrastFillInModes(psp, 8, 8, 0, 1);
configs16 = swrastFillInModes(psp, 16, 16, 0, 1);
configs24 = swrastFillInModes(psp, 24, 24, 8, 1);
configs32 = swrastFillInModes(psp, 32, 24, 8, 1);
- configs16 = driConcatConfigs(configs8, configs16);
configs24 = driConcatConfigs(configs16, configs24);
configs32 = driConcatConfigs(configs24, configs32);
diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index 20b8ff4d1..0fa242997 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v)
static void GLAPIENTRY
VertexAttrib1dvARB(GLuint index, const GLdouble *v)
{
- CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));
+ CALL_VertexAttrib1dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib2dvARB(GLuint index, const GLdouble *v)
{
- CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));
+ CALL_VertexAttrib2dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib3dvARB(GLuint index, const GLdouble *v)
{
- CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));
+ CALL_VertexAttrib3dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib4dvARB(GLuint index, const GLdouble *v)
{
- CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));
+ CALL_VertexAttrib4dv(GET_DISPATCH(), (index, v));
}
@@ -1114,7 +1114,7 @@ VertexAttribI3bv(GLuint index, const GLbyte *v)
static void GLAPIENTRY
VertexAttribI4bv(GLuint index, const GLbyte *v)
{
- CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));
+ CALL_VertexAttribI4bv(GET_DISPATCH(), (index, v));
}
@@ -1139,7 +1139,7 @@ VertexAttribI3ubv(GLuint index, const GLubyte *v)
static void GLAPIENTRY
VertexAttribI4ubv(GLuint index, const GLubyte *v)
{
- CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));
+ CALL_VertexAttribI4ubv(GET_DISPATCH(), (index, v));
}
@@ -1165,7 +1165,7 @@ VertexAttribI3sv(GLuint index, const GLshort *v)
static void GLAPIENTRY
VertexAttribI4sv(GLuint index, const GLshort *v)
{
- CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));
+ CALL_VertexAttribI4sv(GET_DISPATCH(), (index, v));
}
@@ -1190,7 +1190,7 @@ VertexAttribI3usv(GLuint index, const GLushort *v)
static void GLAPIENTRY
VertexAttribI4usv(GLuint index, const GLushort *v)
{
- CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));
+ CALL_VertexAttribI4usv(GET_DISPATCH(), (index, v));
}
@@ -1405,14 +1405,14 @@ GLboolean _ae_create_context( struct gl_context *ctx )
return GL_TRUE;
/* These _gloffset_* values may not be compile-time constants */
- SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;
- SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;
- SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;
- SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;
- SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;
- SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;
+ SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bv;
+ SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubv;
+ SecondaryColorFuncs[2] = _gloffset_SecondaryColor3sv;
+ SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usv;
+ SecondaryColorFuncs[4] = _gloffset_SecondaryColor3iv;
+ SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uiv;
SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;
- SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;
+ SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dv;
FogCoordFuncs[0] = -1;
FogCoordFuncs[1] = -1;
@@ -1421,7 +1421,7 @@ GLboolean _ae_create_context( struct gl_context *ctx )
FogCoordFuncs[4] = -1;
FogCoordFuncs[5] = -1;
FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
- FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
+ FogCoordFuncs[7] = _gloffset_FogCoorddv;
ctx->aelt_context = calloc(1, sizeof(AEcontext));
if (!ctx->aelt_context)
diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c
index 331553086..6b66319a9 100644
--- a/mesalib/src/mesa/main/api_loopback.c
+++ b/mesalib/src/mesa/main/api_loopback.c
@@ -88,7 +88,7 @@
void GLAPIENTRY
-loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
+_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue )
{
COLORF( BYTE_TO_FLOAT(red),
BYTE_TO_FLOAT(green),
@@ -97,41 +97,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
}
void GLAPIENTRY
-loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue )
+_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue )
{
COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 );
}
void GLAPIENTRY
-loopback_Color3i_f( GLint red, GLint green, GLint blue )
+_mesa_Color3i( GLint red, GLint green, GLint blue )
{
COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
INT_TO_FLOAT(blue), 1.0);
}
void GLAPIENTRY
-loopback_Color3s_f( GLshort red, GLshort green, GLshort blue )
+_mesa_Color3s( GLshort red, GLshort green, GLshort blue )
{
COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
SHORT_TO_FLOAT(blue), 1.0);
}
void GLAPIENTRY
-loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue )
+_mesa_Color3ui( GLuint red, GLuint green, GLuint blue )
{
COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
UINT_TO_FLOAT(blue), 1.0 );
}
void GLAPIENTRY
-loopback_Color3us_f( GLushort red, GLushort green, GLushort blue )
+_mesa_Color3us( GLushort red, GLushort green, GLushort blue )
{
COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
USHORT_TO_FLOAT(blue), 1.0 );
}
void GLAPIENTRY
-loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
+_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue )
{
COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
UBYTE_TO_FLOAT(blue), 1.0 );
@@ -139,48 +139,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue )
void GLAPIENTRY
-loopback_Color3bv_f( const GLbyte *v )
+_mesa_Color3bv( const GLbyte *v )
{
COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
BYTE_TO_FLOAT(v[2]), 1.0 );
}
void GLAPIENTRY
-loopback_Color3dv_f( const GLdouble *v )
+_mesa_Color3dv( const GLdouble *v )
{
COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 );
}
void GLAPIENTRY
-loopback_Color3iv_f( const GLint *v )
+_mesa_Color3iv( const GLint *v )
{
COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
INT_TO_FLOAT(v[2]), 1.0 );
}
void GLAPIENTRY
-loopback_Color3sv_f( const GLshort *v )
+_mesa_Color3sv( const GLshort *v )
{
COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
SHORT_TO_FLOAT(v[2]), 1.0 );
}
void GLAPIENTRY
-loopback_Color3uiv_f( const GLuint *v )
+_mesa_Color3uiv( const GLuint *v )
{
COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
UINT_TO_FLOAT(v[2]), 1.0 );
}
void GLAPIENTRY
-loopback_Color3usv_f( const GLushort *v )
+_mesa_Color3usv( const GLushort *v )
{
COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
USHORT_TO_FLOAT(v[2]), 1.0 );
}
void GLAPIENTRY
-loopback_Color3ubv_f( const GLubyte *v )
+_mesa_Color3ubv( const GLubyte *v )
{
COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
UBYTE_TO_FLOAT(v[2]), 1.0 );
@@ -188,7 +188,7 @@ loopback_Color3ubv_f( const GLubyte *v )
void GLAPIENTRY
-loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
+_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue,
GLbyte alpha )
{
COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green),
@@ -196,21 +196,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
}
void GLAPIENTRY
-loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
+_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue,
GLdouble alpha )
{
COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha );
}
void GLAPIENTRY
-loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha )
+_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha )
{
COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green),
INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) );
}
void GLAPIENTRY
-loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
+_mesa_Color4s( GLshort red, GLshort green, GLshort blue,
GLshort alpha )
{
COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green),
@@ -218,21 +218,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
}
void GLAPIENTRY
-loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha )
+_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha )
{
COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green),
UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) );
}
void GLAPIENTRY
-loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha )
+_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha )
{
COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green),
USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) );
}
void GLAPIENTRY
-loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
+_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
{
COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green),
UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) );
@@ -240,7 +240,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha )
void GLAPIENTRY
-loopback_Color4iv_f( const GLint *v )
+_mesa_Color4iv( const GLint *v )
{
COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) );
@@ -248,21 +248,21 @@ loopback_Color4iv_f( const GLint *v )
void GLAPIENTRY
-loopback_Color4bv_f( const GLbyte *v )
+_mesa_Color4bv( const GLbyte *v )
{
COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) );
}
void GLAPIENTRY
-loopback_Color4dv_f( const GLdouble *v )
+_mesa_Color4dv( const GLdouble *v )
{
COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_Color4sv_f( const GLshort *v)
+_mesa_Color4sv( const GLshort *v)
{
COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) );
@@ -270,21 +270,21 @@ loopback_Color4sv_f( const GLshort *v)
void GLAPIENTRY
-loopback_Color4uiv_f( const GLuint *v)
+_mesa_Color4uiv( const GLuint *v)
{
COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) );
}
void GLAPIENTRY
-loopback_Color4usv_f( const GLushort *v)
+_mesa_Color4usv( const GLushort *v)
{
COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) );
}
void GLAPIENTRY
-loopback_Color4ubv_f( const GLubyte *v)
+_mesa_Color4ubv( const GLubyte *v)
{
COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) );
@@ -292,565 +292,565 @@ loopback_Color4ubv_f( const GLubyte *v)
void GLAPIENTRY
-loopback_FogCoorddEXT( GLdouble d )
+_mesa_FogCoordd( GLdouble d )
{
FOGCOORDF( (GLfloat) d );
}
void GLAPIENTRY
-loopback_FogCoorddvEXT( const GLdouble *v )
+_mesa_FogCoorddv( const GLdouble *v )
{
FOGCOORDF( (GLfloat) *v );
}
void GLAPIENTRY
-loopback_Indexd( GLdouble c )
+_mesa_Indexd( GLdouble c )
{
INDEX( (GLfloat) c );
}
void GLAPIENTRY
-loopback_Indexi( GLint c )
+_mesa_Indexi( GLint c )
{
INDEX( (GLfloat) c );
}
void GLAPIENTRY
-loopback_Indexs( GLshort c )
+_mesa_Indexs( GLshort c )
{
INDEX( (GLfloat) c );
}
void GLAPIENTRY
-loopback_Indexub( GLubyte c )
+_mesa_Indexub( GLubyte c )
{
INDEX( (GLfloat) c );
}
void GLAPIENTRY
-loopback_Indexdv( const GLdouble *c )
+_mesa_Indexdv( const GLdouble *c )
{
INDEX( (GLfloat) *c );
}
void GLAPIENTRY
-loopback_Indexiv( const GLint *c )
+_mesa_Indexiv( const GLint *c )
{
INDEX( (GLfloat) *c );
}
void GLAPIENTRY
-loopback_Indexsv( const GLshort *c )
+_mesa_Indexsv( const GLshort *c )
{
INDEX( (GLfloat) *c );
}
void GLAPIENTRY
-loopback_Indexubv( const GLubyte *c )
+_mesa_Indexubv( const GLubyte *c )
{
INDEX( (GLfloat) *c );
}
void GLAPIENTRY
-loopback_EdgeFlagv(const GLboolean *flag)
+_mesa_EdgeFlagv(const GLboolean *flag)
{
CALL_EdgeFlag(GET_DISPATCH(), (*flag));
}
void GLAPIENTRY
-loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
+_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz )
{
NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) );
}
void GLAPIENTRY
-loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
+_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz )
{
NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz);
}
void GLAPIENTRY
-loopback_Normal3i( GLint nx, GLint ny, GLint nz )
+_mesa_Normal3i( GLint nx, GLint ny, GLint nz )
{
NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) );
}
void GLAPIENTRY
-loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz )
+_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz )
{
NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) );
}
void GLAPIENTRY
-loopback_Normal3bv( const GLbyte *v )
+_mesa_Normal3bv( const GLbyte *v )
{
NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) );
}
void GLAPIENTRY
-loopback_Normal3dv( const GLdouble *v )
+_mesa_Normal3dv( const GLdouble *v )
{
NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_Normal3iv( const GLint *v )
+_mesa_Normal3iv( const GLint *v )
{
NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) );
}
void GLAPIENTRY
-loopback_Normal3sv( const GLshort *v )
+_mesa_Normal3sv( const GLshort *v )
{
NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) );
}
void GLAPIENTRY
-loopback_TexCoord1d( GLdouble s )
+_mesa_TexCoord1d( GLdouble s )
{
TEXCOORD1((GLfloat) s);
}
void GLAPIENTRY
-loopback_TexCoord1i( GLint s )
+_mesa_TexCoord1i( GLint s )
{
TEXCOORD1((GLfloat) s);
}
void GLAPIENTRY
-loopback_TexCoord1s( GLshort s )
+_mesa_TexCoord1s( GLshort s )
{
TEXCOORD1((GLfloat) s);
}
void GLAPIENTRY
-loopback_TexCoord2d( GLdouble s, GLdouble t )
+_mesa_TexCoord2d( GLdouble s, GLdouble t )
{
TEXCOORD2((GLfloat) s,(GLfloat) t);
}
void GLAPIENTRY
-loopback_TexCoord2s( GLshort s, GLshort t )
+_mesa_TexCoord2s( GLshort s, GLshort t )
{
TEXCOORD2((GLfloat) s,(GLfloat) t);
}
void GLAPIENTRY
-loopback_TexCoord2i( GLint s, GLint t )
+_mesa_TexCoord2i( GLint s, GLint t )
{
TEXCOORD2((GLfloat) s,(GLfloat) t);
}
void GLAPIENTRY
-loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
+_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r )
{
TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
}
void GLAPIENTRY
-loopback_TexCoord3i( GLint s, GLint t, GLint r )
+_mesa_TexCoord3i( GLint s, GLint t, GLint r )
{
TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
}
void GLAPIENTRY
-loopback_TexCoord3s( GLshort s, GLshort t, GLshort r )
+_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r )
{
TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r);
}
void GLAPIENTRY
-loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
+_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q )
{
TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
}
void GLAPIENTRY
-loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
+_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q )
{
TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
}
void GLAPIENTRY
-loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
+_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q )
{
TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q);
}
void GLAPIENTRY
-loopback_TexCoord1dv( const GLdouble *v )
+_mesa_TexCoord1dv( const GLdouble *v )
{
TEXCOORD1((GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_TexCoord1iv( const GLint *v )
+_mesa_TexCoord1iv( const GLint *v )
{
TEXCOORD1((GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_TexCoord1sv( const GLshort *v )
+_mesa_TexCoord1sv( const GLshort *v )
{
TEXCOORD1((GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_TexCoord2dv( const GLdouble *v )
+_mesa_TexCoord2dv( const GLdouble *v )
{
TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_TexCoord2iv( const GLint *v )
+_mesa_TexCoord2iv( const GLint *v )
{
TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_TexCoord2sv( const GLshort *v )
+_mesa_TexCoord2sv( const GLshort *v )
{
TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_TexCoord3dv( const GLdouble *v )
+_mesa_TexCoord3dv( const GLdouble *v )
{
TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_TexCoord3iv( const GLint *v )
+_mesa_TexCoord3iv( const GLint *v )
{
TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_TexCoord3sv( const GLshort *v )
+_mesa_TexCoord3sv( const GLshort *v )
{
TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_TexCoord4dv( const GLdouble *v )
+_mesa_TexCoord4dv( const GLdouble *v )
{
TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_TexCoord4iv( const GLint *v )
+_mesa_TexCoord4iv( const GLint *v )
{
TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_TexCoord4sv( const GLshort *v )
+_mesa_TexCoord4sv( const GLshort *v )
{
TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_Vertex2d( GLdouble x, GLdouble y )
+_mesa_Vertex2d( GLdouble x, GLdouble y )
{
VERTEX2( (GLfloat) x, (GLfloat) y );
}
void GLAPIENTRY
-loopback_Vertex2i( GLint x, GLint y )
+_mesa_Vertex2i( GLint x, GLint y )
{
VERTEX2( (GLfloat) x, (GLfloat) y );
}
void GLAPIENTRY
-loopback_Vertex2s( GLshort x, GLshort y )
+_mesa_Vertex2s( GLshort x, GLshort y )
{
VERTEX2( (GLfloat) x, (GLfloat) y );
}
void GLAPIENTRY
-loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
+_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z )
{
VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
}
void GLAPIENTRY
-loopback_Vertex3i( GLint x, GLint y, GLint z )
+_mesa_Vertex3i( GLint x, GLint y, GLint z )
{
VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
}
void GLAPIENTRY
-loopback_Vertex3s( GLshort x, GLshort y, GLshort z )
+_mesa_Vertex3s( GLshort x, GLshort y, GLshort z )
{
VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z );
}
void GLAPIENTRY
-loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
+_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w )
{
VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
}
void GLAPIENTRY
-loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w )
+_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w )
{
VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
}
void GLAPIENTRY
-loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
+_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w )
{
VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w );
}
void GLAPIENTRY
-loopback_Vertex2dv( const GLdouble *v )
+_mesa_Vertex2dv( const GLdouble *v )
{
VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_Vertex2iv( const GLint *v )
+_mesa_Vertex2iv( const GLint *v )
{
VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_Vertex2sv( const GLshort *v )
+_mesa_Vertex2sv( const GLshort *v )
{
VERTEX2( (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_Vertex3dv( const GLdouble *v )
+_mesa_Vertex3dv( const GLdouble *v )
{
VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_Vertex3iv( const GLint *v )
+_mesa_Vertex3iv( const GLint *v )
{
VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_Vertex3sv( const GLshort *v )
+_mesa_Vertex3sv( const GLshort *v )
{
VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_Vertex4dv( const GLdouble *v )
+_mesa_Vertex4dv( const GLdouble *v )
{
VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_Vertex4iv( const GLint *v )
+_mesa_Vertex4iv( const GLint *v )
{
VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_Vertex4sv( const GLshort *v )
+_mesa_Vertex4sv( const GLshort *v )
{
VERTEX4( (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_MultiTexCoord1dARB(GLenum target, GLdouble s)
+_mesa_MultiTexCoord1d(GLenum target, GLdouble s)
{
MULTI_TEXCOORD1( target, (GLfloat) s );
}
void GLAPIENTRY
-loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v)
{
MULTI_TEXCOORD1( target, (GLfloat) v[0] );
}
void GLAPIENTRY
-loopback_MultiTexCoord1iARB(GLenum target, GLint s)
+_mesa_MultiTexCoord1i(GLenum target, GLint s)
{
MULTI_TEXCOORD1( target, (GLfloat) s );
}
void GLAPIENTRY
-loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord1iv(GLenum target, const GLint *v)
{
MULTI_TEXCOORD1( target, (GLfloat) v[0] );
}
void GLAPIENTRY
-loopback_MultiTexCoord1sARB(GLenum target, GLshort s)
+_mesa_MultiTexCoord1s(GLenum target, GLshort s)
{
MULTI_TEXCOORD1( target, (GLfloat) s );
}
void GLAPIENTRY
-loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v)
{
MULTI_TEXCOORD1( target, (GLfloat) v[0] );
}
void GLAPIENTRY
-loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t)
+_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
{
MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
}
void GLAPIENTRY
-loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v)
{
MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t)
+_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t)
{
MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
}
void GLAPIENTRY
-loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord2iv(GLenum target, const GLint *v)
{
MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t)
+_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t)
{
MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t );
}
void GLAPIENTRY
-loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v)
{
MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] );
}
void GLAPIENTRY
-loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r)
+_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
{
MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
}
void GLAPIENTRY
-loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v)
{
MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r)
+_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
{
MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
}
void GLAPIENTRY
-loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord3iv(GLenum target, const GLint *v)
{
MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r)
+_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
{
MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r );
}
void GLAPIENTRY
-loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v)
{
MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
+_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
{
MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
(GLfloat) r, (GLfloat) q );
}
void GLAPIENTRY
-loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v)
+_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v)
{
MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q)
+_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
{
MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
(GLfloat) r, (GLfloat) q );
}
void GLAPIENTRY
-loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v)
+_mesa_MultiTexCoord4iv(GLenum target, const GLint *v)
{
MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
+_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
{
MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t,
(GLfloat) r, (GLfloat) q );
}
void GLAPIENTRY
-loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v)
+_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v)
{
MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1],
(GLfloat) v[2], (GLfloat) v[3] );
}
void GLAPIENTRY
-loopback_EvalCoord2dv( const GLdouble *u )
+_mesa_EvalCoord2dv( const GLdouble *u )
{
EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
}
void GLAPIENTRY
-loopback_EvalCoord2fv( const GLfloat *u )
+_mesa_EvalCoord2fv( const GLfloat *u )
{
EVALCOORD2( u[0], u[1] );
}
void GLAPIENTRY
-loopback_EvalCoord2d( GLdouble u, GLdouble v )
+_mesa_EvalCoord2d( GLdouble u, GLdouble v )
{
EVALCOORD2( (GLfloat) u, (GLfloat) v );
}
void GLAPIENTRY
-loopback_EvalCoord1dv( const GLdouble *u )
+_mesa_EvalCoord1dv( const GLdouble *u )
{
EVALCOORD1( (GLfloat) *u );
}
void GLAPIENTRY
-loopback_EvalCoord1fv( const GLfloat *u )
+_mesa_EvalCoord1fv( const GLfloat *u )
{
EVALCOORD1( (GLfloat) *u );
}
void GLAPIENTRY
-loopback_EvalCoord1d( GLdouble u )
+_mesa_EvalCoord1d( GLdouble u )
{
EVALCOORD1( (GLfloat) u );
}
void GLAPIENTRY
-loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
+_mesa_Materialf( GLenum face, GLenum pname, GLfloat param )
{
GLfloat fparam[4];
fparam[0] = param;
@@ -858,14 +858,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param )
}
void GLAPIENTRY
-loopback_Materiali(GLenum face, GLenum pname, GLint param )
+_mesa_Materiali(GLenum face, GLenum pname, GLint param )
{
GLfloat p = (GLfloat) param;
MATERIALFV(face, pname, &p);
}
void GLAPIENTRY
-loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
+_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params )
{
GLfloat fparam[4];
switch (pname) {
@@ -895,49 +895,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params )
void GLAPIENTRY
-loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
+_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
{
RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
}
void GLAPIENTRY
-loopback_Rectdv(const GLdouble *v1, const GLdouble *v2)
+_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2)
{
RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
}
void GLAPIENTRY
-loopback_Rectfv(const GLfloat *v1, const GLfloat *v2)
+_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2)
{
RECTF(v1[0], v1[1], v2[0], v2[1]);
}
void GLAPIENTRY
-loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
+_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
{
RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
}
void GLAPIENTRY
-loopback_Rectiv(const GLint *v1, const GLint *v2)
+_mesa_Rectiv(const GLint *v1, const GLint *v2)
{
RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
}
void GLAPIENTRY
-loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
+_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
{
RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2);
}
void GLAPIENTRY
-loopback_Rectsv(const GLshort *v1, const GLshort *v2)
+_mesa_Rectsv(const GLshort *v1, const GLshort *v2)
{
RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]);
}
void GLAPIENTRY
-loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
+_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue )
{
SECONDARYCOLORF( BYTE_TO_FLOAT(red),
BYTE_TO_FLOAT(green),
@@ -945,13 +945,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue )
+_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue )
{
SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue );
}
void GLAPIENTRY
-loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
+_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue )
{
SECONDARYCOLORF( INT_TO_FLOAT(red),
INT_TO_FLOAT(green),
@@ -959,7 +959,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
+_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue )
{
SECONDARYCOLORF(SHORT_TO_FLOAT(red),
SHORT_TO_FLOAT(green),
@@ -967,7 +967,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
+_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue )
{
SECONDARYCOLORF(UINT_TO_FLOAT(red),
UINT_TO_FLOAT(green),
@@ -975,7 +975,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
+_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue )
{
SECONDARYCOLORF(USHORT_TO_FLOAT(red),
USHORT_TO_FLOAT(green),
@@ -983,7 +983,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
+_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue )
{
SECONDARYCOLORF(UBYTE_TO_FLOAT(red),
UBYTE_TO_FLOAT(green),
@@ -991,7 +991,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue )
}
void GLAPIENTRY
-loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
+_mesa_SecondaryColor3bv( const GLbyte *v )
{
SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]),
BYTE_TO_FLOAT(v[1]),
@@ -999,12 +999,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v )
}
void GLAPIENTRY
-loopback_SecondaryColor3dvEXT_f( const GLdouble *v )
+_mesa_SecondaryColor3dv( const GLdouble *v )
{
SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] );
}
void GLAPIENTRY
-loopback_SecondaryColor3ivEXT_f( const GLint *v )
+_mesa_SecondaryColor3iv( const GLint *v )
{
SECONDARYCOLORF(INT_TO_FLOAT(v[0]),
INT_TO_FLOAT(v[1]),
@@ -1012,7 +1012,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v )
}
void GLAPIENTRY
-loopback_SecondaryColor3svEXT_f( const GLshort *v )
+_mesa_SecondaryColor3sv( const GLshort *v )
{
SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]),
SHORT_TO_FLOAT(v[1]),
@@ -1020,7 +1020,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v )
}
void GLAPIENTRY
-loopback_SecondaryColor3uivEXT_f( const GLuint *v )
+_mesa_SecondaryColor3uiv( const GLuint *v )
{
SECONDARYCOLORF(UINT_TO_FLOAT(v[0]),
UINT_TO_FLOAT(v[1]),
@@ -1028,7 +1028,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v )
}
void GLAPIENTRY
-loopback_SecondaryColor3usvEXT_f( const GLushort *v )
+_mesa_SecondaryColor3usv( const GLushort *v )
{
SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]),
USHORT_TO_FLOAT(v[1]),
@@ -1036,7 +1036,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v )
}
void GLAPIENTRY
-loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
+_mesa_SecondaryColor3ubv( const GLubyte *v )
{
SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]),
UBYTE_TO_FLOAT(v[1]),
@@ -1051,111 +1051,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v )
*/
void GLAPIENTRY
-loopback_VertexAttrib1sNV(GLuint index, GLshort x)
+_mesa_VertexAttrib1sNV(GLuint index, GLshort x)
{
ATTRIB1NV(index, (GLfloat) x);
}
void GLAPIENTRY
-loopback_VertexAttrib1dNV(GLuint index, GLdouble x)
+_mesa_VertexAttrib1dNV(GLuint index, GLdouble x)
{
ATTRIB1NV(index, (GLfloat) x);
}
void GLAPIENTRY
-loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
+_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y)
{
ATTRIB2NV(index, (GLfloat) x, y);
}
void GLAPIENTRY
-loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
+_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y)
{
ATTRIB2NV(index, (GLfloat) x, (GLfloat) y);
}
void GLAPIENTRY
-loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
+_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z)
{
ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
}
void GLAPIENTRY
-loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z)
{
ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
-loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
{
ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void GLAPIENTRY
-loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void GLAPIENTRY
-loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
{
ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
}
void GLAPIENTRY
-loopback_VertexAttrib1svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v)
{
ATTRIB1NV(index, (GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v)
{
ATTRIB1NV(index, (GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_VertexAttrib2svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v)
{
ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v)
{
ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_VertexAttrib3svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v)
{
ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v)
{
ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_VertexAttrib4svNV(GLuint index, const GLshort *v)
+_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v)
{
ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2],
(GLfloat)v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v)
{
ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
+_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
{
ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
@@ -1163,15 +1163,15 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
void GLAPIENTRY
-loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib1svNV(index + i, v + i);
+ _mesa_VertexAttrib1svNV(index + i, v + i);
}
void GLAPIENTRY
-loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
@@ -1179,23 +1179,23 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
}
void GLAPIENTRY
-loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib1dvNV(index + i, v + i);
+ _mesa_VertexAttrib1dvNV(index + i, v + i);
}
void GLAPIENTRY
-loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib2svNV(index + i, v + 2 * i);
+ _mesa_VertexAttrib2svNV(index + i, v + 2 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
@@ -1203,23 +1203,23 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
}
void GLAPIENTRY
-loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib2dvNV(index + i, v + 2 * i);
+ _mesa_VertexAttrib2dvNV(index + i, v + 2 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib3svNV(index + i, v + 3 * i);
+ _mesa_VertexAttrib3svNV(index + i, v + 3 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
@@ -1227,23 +1227,23 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
}
void GLAPIENTRY
-loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib3dvNV(index + i, v + 3 * i);
+ _mesa_VertexAttrib3dvNV(index + i, v + 3 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
+_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib4svNV(index + i, v + 4 * i);
+ _mesa_VertexAttrib4svNV(index + i, v + 4 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
+_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
@@ -1251,19 +1251,19 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
}
void GLAPIENTRY
-loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
+_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib4dvNV(index + i, v + 4 * i);
+ _mesa_VertexAttrib4dvNV(index + i, v + 4 * i);
}
void GLAPIENTRY
-loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
+_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
{
GLint i;
for (i = n - 1; i >= 0; i--)
- loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);
+ _mesa_VertexAttrib4ubvNV(index + i, v + 4 * i);
}
@@ -1274,176 +1274,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
*/
void GLAPIENTRY
-loopback_VertexAttrib1sARB(GLuint index, GLshort x)
+_mesa_VertexAttrib1s(GLuint index, GLshort x)
{
ATTRIB1ARB(index, (GLfloat) x);
}
void GLAPIENTRY
-loopback_VertexAttrib1dARB(GLuint index, GLdouble x)
+_mesa_VertexAttrib1d(GLuint index, GLdouble x)
{
ATTRIB1ARB(index, (GLfloat) x);
}
void GLAPIENTRY
-loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y)
+_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y)
{
ATTRIB2ARB(index, (GLfloat) x, y);
}
void GLAPIENTRY
-loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y)
+_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
{
ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y);
}
void GLAPIENTRY
-loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z)
+_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
{
ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z);
}
void GLAPIENTRY
-loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z)
+_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
{
ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
-loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
+_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
{
ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void GLAPIENTRY
-loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
+_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
{
ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w);
}
void GLAPIENTRY
-loopback_VertexAttrib1svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib1sv(GLuint index, const GLshort *v)
{
ATTRIB1ARB(index, (GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v)
{
ATTRIB1ARB(index, (GLfloat) v[0]);
}
void GLAPIENTRY
-loopback_VertexAttrib2svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib2sv(GLuint index, const GLshort *v)
{
ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v)
{
ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]);
}
void GLAPIENTRY
-loopback_VertexAttrib3svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib3sv(GLuint index, const GLshort *v)
{
ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v)
{
ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]);
}
void GLAPIENTRY
-loopback_VertexAttrib4svARB(GLuint index, const GLshort *v)
+_mesa_VertexAttrib4sv(GLuint index, const GLshort *v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2],
(GLfloat)v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v)
+_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v)
+_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4ivARB(GLuint index, const GLint * v)
+_mesa_VertexAttrib4iv(GLuint index, const GLint * v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v)
+_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v)
+_mesa_VertexAttrib4usv(GLuint index, const GLushort * v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v)
+_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v)
{
ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]);
}
void GLAPIENTRY
-loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v)
+_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v)
{
ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]),
BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]));
}
void GLAPIENTRY
-loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v)
+_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v)
{
ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]),
SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]));
}
void GLAPIENTRY
-loopback_VertexAttrib4NivARB(GLuint index, const GLint * v)
+_mesa_VertexAttrib4Niv(GLuint index, const GLint * v)
{
ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]),
INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]));
}
void GLAPIENTRY
-loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
+_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
{
ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y),
UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w));
}
void GLAPIENTRY
-loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v)
+_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v)
{
ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]),
UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]));
}
void GLAPIENTRY
-loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v)
+_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v)
{
ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]),
USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]));
}
void GLAPIENTRY
-loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
+_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v)
{
ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]),
UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]));
@@ -1457,37 +1457,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v)
*/
void GLAPIENTRY
-loopback_VertexAttribI1iv(GLuint index, const GLint *v)
+_mesa_VertexAttribI1iv(GLuint index, const GLint *v)
{
ATTRIBI_1I(index, v[0]);
}
void GLAPIENTRY
-loopback_VertexAttribI1uiv(GLuint index, const GLuint *v)
+_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v)
{
ATTRIBI_1UI(index, v[0]);
}
void GLAPIENTRY
-loopback_VertexAttribI4bv(GLuint index, const GLbyte *v)
+_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v)
{
ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);
}
void GLAPIENTRY
-loopback_VertexAttribI4sv(GLuint index, const GLshort *v)
+_mesa_VertexAttribI4sv(GLuint index, const GLshort *v)
{
ATTRIBI_4I(index, v[0], v[1], v[2], v[3]);
}
void GLAPIENTRY
-loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v)
+_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v)
{
ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
}
void GLAPIENTRY
-loopback_VertexAttribI4usv(GLuint index, const GLushort *v)
+_mesa_VertexAttribI4usv(GLuint index, const GLushort *v)
{
ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
}
@@ -1504,226 +1504,226 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
struct _glapi_table *dest)
{
if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
- SET_Color4ub(dest, loopback_Color4ub_f);
- SET_Materialf(dest, loopback_Materialf);
+ SET_Color4ub(dest, _mesa_Color4ub);
+ SET_Materialf(dest, _mesa_Materialf);
}
if (ctx->API == API_OPENGL) {
- SET_Color3b(dest, loopback_Color3b_f);
- SET_Color3d(dest, loopback_Color3d_f);
- SET_Color3i(dest, loopback_Color3i_f);
- SET_Color3s(dest, loopback_Color3s_f);
- SET_Color3ui(dest, loopback_Color3ui_f);
- SET_Color3us(dest, loopback_Color3us_f);
- SET_Color3ub(dest, loopback_Color3ub_f);
- SET_Color4b(dest, loopback_Color4b_f);
- SET_Color4d(dest, loopback_Color4d_f);
- SET_Color4i(dest, loopback_Color4i_f);
- SET_Color4s(dest, loopback_Color4s_f);
- SET_Color4ui(dest, loopback_Color4ui_f);
- SET_Color4us(dest, loopback_Color4us_f);
- SET_Color3bv(dest, loopback_Color3bv_f);
- SET_Color3dv(dest, loopback_Color3dv_f);
- SET_Color3iv(dest, loopback_Color3iv_f);
- SET_Color3sv(dest, loopback_Color3sv_f);
- SET_Color3uiv(dest, loopback_Color3uiv_f);
- SET_Color3usv(dest, loopback_Color3usv_f);
- SET_Color3ubv(dest, loopback_Color3ubv_f);
- SET_Color4bv(dest, loopback_Color4bv_f);
- SET_Color4dv(dest, loopback_Color4dv_f);
- SET_Color4iv(dest, loopback_Color4iv_f);
- SET_Color4sv(dest, loopback_Color4sv_f);
- SET_Color4uiv(dest, loopback_Color4uiv_f);
- SET_Color4usv(dest, loopback_Color4usv_f);
- SET_Color4ubv(dest, loopback_Color4ubv_f);
-
- SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f);
- SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f);
- SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f);
- SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f);
- SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f);
- SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f);
- SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f);
- SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f);
- SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f);
- SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f);
- SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f);
- SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f);
- SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f);
- SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f);
+ SET_Color3b(dest, _mesa_Color3b);
+ SET_Color3d(dest, _mesa_Color3d);
+ SET_Color3i(dest, _mesa_Color3i);
+ SET_Color3s(dest, _mesa_Color3s);
+ SET_Color3ui(dest, _mesa_Color3ui);
+ SET_Color3us(dest, _mesa_Color3us);
+ SET_Color3ub(dest, _mesa_Color3ub);
+ SET_Color4b(dest, _mesa_Color4b);
+ SET_Color4d(dest, _mesa_Color4d);
+ SET_Color4i(dest, _mesa_Color4i);
+ SET_Color4s(dest, _mesa_Color4s);
+ SET_Color4ui(dest, _mesa_Color4ui);
+ SET_Color4us(dest, _mesa_Color4us);
+ SET_Color3bv(dest, _mesa_Color3bv);
+ SET_Color3dv(dest, _mesa_Color3dv);
+ SET_Color3iv(dest, _mesa_Color3iv);
+ SET_Color3sv(dest, _mesa_Color3sv);
+ SET_Color3uiv(dest, _mesa_Color3uiv);
+ SET_Color3usv(dest, _mesa_Color3usv);
+ SET_Color3ubv(dest, _mesa_Color3ubv);
+ SET_Color4bv(dest, _mesa_Color4bv);
+ SET_Color4dv(dest, _mesa_Color4dv);
+ SET_Color4iv(dest, _mesa_Color4iv);
+ SET_Color4sv(dest, _mesa_Color4sv);
+ SET_Color4uiv(dest, _mesa_Color4uiv);
+ SET_Color4usv(dest, _mesa_Color4usv);
+ SET_Color4ubv(dest, _mesa_Color4ubv);
+
+ SET_SecondaryColor3b(dest, _mesa_SecondaryColor3b);
+ SET_SecondaryColor3d(dest, _mesa_SecondaryColor3d);
+ SET_SecondaryColor3i(dest, _mesa_SecondaryColor3i);
+ SET_SecondaryColor3s(dest, _mesa_SecondaryColor3s);
+ SET_SecondaryColor3ui(dest, _mesa_SecondaryColor3ui);
+ SET_SecondaryColor3us(dest, _mesa_SecondaryColor3us);
+ SET_SecondaryColor3ub(dest, _mesa_SecondaryColor3ub);
+ SET_SecondaryColor3bv(dest, _mesa_SecondaryColor3bv);
+ SET_SecondaryColor3dv(dest, _mesa_SecondaryColor3dv);
+ SET_SecondaryColor3iv(dest, _mesa_SecondaryColor3iv);
+ SET_SecondaryColor3sv(dest, _mesa_SecondaryColor3sv);
+ SET_SecondaryColor3uiv(dest, _mesa_SecondaryColor3uiv);
+ SET_SecondaryColor3usv(dest, _mesa_SecondaryColor3usv);
+ SET_SecondaryColor3ubv(dest, _mesa_SecondaryColor3ubv);
- SET_EdgeFlagv(dest, loopback_EdgeFlagv);
-
- SET_Indexd(dest, loopback_Indexd);
- SET_Indexi(dest, loopback_Indexi);
- SET_Indexs(dest, loopback_Indexs);
- SET_Indexub(dest, loopback_Indexub);
- SET_Indexdv(dest, loopback_Indexdv);
- SET_Indexiv(dest, loopback_Indexiv);
- SET_Indexsv(dest, loopback_Indexsv);
- SET_Indexubv(dest, loopback_Indexubv);
- SET_Normal3b(dest, loopback_Normal3b);
- SET_Normal3d(dest, loopback_Normal3d);
- SET_Normal3i(dest, loopback_Normal3i);
- SET_Normal3s(dest, loopback_Normal3s);
- SET_Normal3bv(dest, loopback_Normal3bv);
- SET_Normal3dv(dest, loopback_Normal3dv);
- SET_Normal3iv(dest, loopback_Normal3iv);
- SET_Normal3sv(dest, loopback_Normal3sv);
- SET_TexCoord1d(dest, loopback_TexCoord1d);
- SET_TexCoord1i(dest, loopback_TexCoord1i);
- SET_TexCoord1s(dest, loopback_TexCoord1s);
- SET_TexCoord2d(dest, loopback_TexCoord2d);
- SET_TexCoord2s(dest, loopback_TexCoord2s);
- SET_TexCoord2i(dest, loopback_TexCoord2i);
- SET_TexCoord3d(dest, loopback_TexCoord3d);
- SET_TexCoord3i(dest, loopback_TexCoord3i);
- SET_TexCoord3s(dest, loopback_TexCoord3s);
- SET_TexCoord4d(dest, loopback_TexCoord4d);
- SET_TexCoord4i(dest, loopback_TexCoord4i);
- SET_TexCoord4s(dest, loopback_TexCoord4s);
- SET_TexCoord1dv(dest, loopback_TexCoord1dv);
- SET_TexCoord1iv(dest, loopback_TexCoord1iv);
- SET_TexCoord1sv(dest, loopback_TexCoord1sv);
- SET_TexCoord2dv(dest, loopback_TexCoord2dv);
- SET_TexCoord2iv(dest, loopback_TexCoord2iv);
- SET_TexCoord2sv(dest, loopback_TexCoord2sv);
- SET_TexCoord3dv(dest, loopback_TexCoord3dv);
- SET_TexCoord3iv(dest, loopback_TexCoord3iv);
- SET_TexCoord3sv(dest, loopback_TexCoord3sv);
- SET_TexCoord4dv(dest, loopback_TexCoord4dv);
- SET_TexCoord4iv(dest, loopback_TexCoord4iv);
- SET_TexCoord4sv(dest, loopback_TexCoord4sv);
- SET_Vertex2d(dest, loopback_Vertex2d);
- SET_Vertex2i(dest, loopback_Vertex2i);
- SET_Vertex2s(dest, loopback_Vertex2s);
- SET_Vertex3d(dest, loopback_Vertex3d);
- SET_Vertex3i(dest, loopback_Vertex3i);
- SET_Vertex3s(dest, loopback_Vertex3s);
- SET_Vertex4d(dest, loopback_Vertex4d);
- SET_Vertex4i(dest, loopback_Vertex4i);
- SET_Vertex4s(dest, loopback_Vertex4s);
- SET_Vertex2dv(dest, loopback_Vertex2dv);
- SET_Vertex2iv(dest, loopback_Vertex2iv);
- SET_Vertex2sv(dest, loopback_Vertex2sv);
- SET_Vertex3dv(dest, loopback_Vertex3dv);
- SET_Vertex3iv(dest, loopback_Vertex3iv);
- SET_Vertex3sv(dest, loopback_Vertex3sv);
- SET_Vertex4dv(dest, loopback_Vertex4dv);
- SET_Vertex4iv(dest, loopback_Vertex4iv);
- SET_Vertex4sv(dest, loopback_Vertex4sv);
- SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB);
- SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB);
- SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB);
- SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB);
- SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB);
- SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB);
- SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB);
- SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB);
- SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB);
- SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB);
- SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB);
- SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB);
- SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB);
- SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB);
- SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB);
- SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB);
- SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB);
- SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB);
- SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB);
- SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB);
- SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB);
- SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB);
- SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB);
- SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB);
- SET_EvalCoord2dv(dest, loopback_EvalCoord2dv);
- SET_EvalCoord2fv(dest, loopback_EvalCoord2fv);
- SET_EvalCoord2d(dest, loopback_EvalCoord2d);
- SET_EvalCoord1dv(dest, loopback_EvalCoord1dv);
- SET_EvalCoord1fv(dest, loopback_EvalCoord1fv);
- SET_EvalCoord1d(dest, loopback_EvalCoord1d);
- SET_Materiali(dest, loopback_Materiali);
- SET_Materialiv(dest, loopback_Materialiv);
- SET_Rectd(dest, loopback_Rectd);
- SET_Rectdv(dest, loopback_Rectdv);
- SET_Rectfv(dest, loopback_Rectfv);
- SET_Recti(dest, loopback_Recti);
- SET_Rectiv(dest, loopback_Rectiv);
- SET_Rects(dest, loopback_Rects);
- SET_Rectsv(dest, loopback_Rectsv);
- SET_FogCoorddEXT(dest, loopback_FogCoorddEXT);
- SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT);
+ SET_EdgeFlagv(dest, _mesa_EdgeFlagv);
+
+ SET_Indexd(dest, _mesa_Indexd);
+ SET_Indexi(dest, _mesa_Indexi);
+ SET_Indexs(dest, _mesa_Indexs);
+ SET_Indexub(dest, _mesa_Indexub);
+ SET_Indexdv(dest, _mesa_Indexdv);
+ SET_Indexiv(dest, _mesa_Indexiv);
+ SET_Indexsv(dest, _mesa_Indexsv);
+ SET_Indexubv(dest, _mesa_Indexubv);
+ SET_Normal3b(dest, _mesa_Normal3b);
+ SET_Normal3d(dest, _mesa_Normal3d);
+ SET_Normal3i(dest, _mesa_Normal3i);
+ SET_Normal3s(dest, _mesa_Normal3s);
+ SET_Normal3bv(dest, _mesa_Normal3bv);
+ SET_Normal3dv(dest, _mesa_Normal3dv);
+ SET_Normal3iv(dest, _mesa_Normal3iv);
+ SET_Normal3sv(dest, _mesa_Normal3sv);
+ SET_TexCoord1d(dest, _mesa_TexCoord1d);
+ SET_TexCoord1i(dest, _mesa_TexCoord1i);
+ SET_TexCoord1s(dest, _mesa_TexCoord1s);
+ SET_TexCoord2d(dest, _mesa_TexCoord2d);
+ SET_TexCoord2s(dest, _mesa_TexCoord2s);
+ SET_TexCoord2i(dest, _mesa_TexCoord2i);
+ SET_TexCoord3d(dest, _mesa_TexCoord3d);
+ SET_TexCoord3i(dest, _mesa_TexCoord3i);
+ SET_TexCoord3s(dest, _mesa_TexCoord3s);
+ SET_TexCoord4d(dest, _mesa_TexCoord4d);
+ SET_TexCoord4i(dest, _mesa_TexCoord4i);
+ SET_TexCoord4s(dest, _mesa_TexCoord4s);
+ SET_TexCoord1dv(dest, _mesa_TexCoord1dv);
+ SET_TexCoord1iv(dest, _mesa_TexCoord1iv);
+ SET_TexCoord1sv(dest, _mesa_TexCoord1sv);
+ SET_TexCoord2dv(dest, _mesa_TexCoord2dv);
+ SET_TexCoord2iv(dest, _mesa_TexCoord2iv);
+ SET_TexCoord2sv(dest, _mesa_TexCoord2sv);
+ SET_TexCoord3dv(dest, _mesa_TexCoord3dv);
+ SET_TexCoord3iv(dest, _mesa_TexCoord3iv);
+ SET_TexCoord3sv(dest, _mesa_TexCoord3sv);
+ SET_TexCoord4dv(dest, _mesa_TexCoord4dv);
+ SET_TexCoord4iv(dest, _mesa_TexCoord4iv);
+ SET_TexCoord4sv(dest, _mesa_TexCoord4sv);
+ SET_Vertex2d(dest, _mesa_Vertex2d);
+ SET_Vertex2i(dest, _mesa_Vertex2i);
+ SET_Vertex2s(dest, _mesa_Vertex2s);
+ SET_Vertex3d(dest, _mesa_Vertex3d);
+ SET_Vertex3i(dest, _mesa_Vertex3i);
+ SET_Vertex3s(dest, _mesa_Vertex3s);
+ SET_Vertex4d(dest, _mesa_Vertex4d);
+ SET_Vertex4i(dest, _mesa_Vertex4i);
+ SET_Vertex4s(dest, _mesa_Vertex4s);
+ SET_Vertex2dv(dest, _mesa_Vertex2dv);
+ SET_Vertex2iv(dest, _mesa_Vertex2iv);
+ SET_Vertex2sv(dest, _mesa_Vertex2sv);
+ SET_Vertex3dv(dest, _mesa_Vertex3dv);
+ SET_Vertex3iv(dest, _mesa_Vertex3iv);
+ SET_Vertex3sv(dest, _mesa_Vertex3sv);
+ SET_Vertex4dv(dest, _mesa_Vertex4dv);
+ SET_Vertex4iv(dest, _mesa_Vertex4iv);
+ SET_Vertex4sv(dest, _mesa_Vertex4sv);
+ SET_MultiTexCoord1d(dest, _mesa_MultiTexCoord1d);
+ SET_MultiTexCoord1dv(dest, _mesa_MultiTexCoord1dv);
+ SET_MultiTexCoord1i(dest, _mesa_MultiTexCoord1i);
+ SET_MultiTexCoord1iv(dest, _mesa_MultiTexCoord1iv);
+ SET_MultiTexCoord1s(dest, _mesa_MultiTexCoord1s);
+ SET_MultiTexCoord1sv(dest, _mesa_MultiTexCoord1sv);
+ SET_MultiTexCoord2d(dest, _mesa_MultiTexCoord2d);
+ SET_MultiTexCoord2dv(dest, _mesa_MultiTexCoord2dv);
+ SET_MultiTexCoord2i(dest, _mesa_MultiTexCoord2i);
+ SET_MultiTexCoord2iv(dest, _mesa_MultiTexCoord2iv);
+ SET_MultiTexCoord2s(dest, _mesa_MultiTexCoord2s);
+ SET_MultiTexCoord2sv(dest, _mesa_MultiTexCoord2sv);
+ SET_MultiTexCoord3d(dest, _mesa_MultiTexCoord3d);
+ SET_MultiTexCoord3dv(dest, _mesa_MultiTexCoord3dv);
+ SET_MultiTexCoord3i(dest, _mesa_MultiTexCoord3i);
+ SET_MultiTexCoord3iv(dest, _mesa_MultiTexCoord3iv);
+ SET_MultiTexCoord3s(dest, _mesa_MultiTexCoord3s);
+ SET_MultiTexCoord3sv(dest, _mesa_MultiTexCoord3sv);
+ SET_MultiTexCoord4d(dest, _mesa_MultiTexCoord4d);
+ SET_MultiTexCoord4dv(dest, _mesa_MultiTexCoord4dv);
+ SET_MultiTexCoord4i(dest, _mesa_MultiTexCoord4i);
+ SET_MultiTexCoord4iv(dest, _mesa_MultiTexCoord4iv);
+ SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s);
+ SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv);
+ SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv);
+ SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv);
+ SET_EvalCoord2d(dest, _mesa_EvalCoord2d);
+ SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv);
+ SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv);
+ SET_EvalCoord1d(dest, _mesa_EvalCoord1d);
+ SET_Materiali(dest, _mesa_Materiali);
+ SET_Materialiv(dest, _mesa_Materialiv);
+ SET_Rectd(dest, _mesa_Rectd);
+ SET_Rectdv(dest, _mesa_Rectdv);
+ SET_Rectfv(dest, _mesa_Rectfv);
+ SET_Recti(dest, _mesa_Recti);
+ SET_Rectiv(dest, _mesa_Rectiv);
+ SET_Rects(dest, _mesa_Rects);
+ SET_Rectsv(dest, _mesa_Rectsv);
+ SET_FogCoordd(dest, _mesa_FogCoordd);
+ SET_FogCoorddv(dest, _mesa_FogCoorddv);
}
if (ctx->API == API_OPENGL) {
- SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV);
- SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV);
- SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV);
- SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV);
- SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV);
- SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV);
- SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV);
- SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV);
- SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV);
- SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV);
- SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV);
- SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV);
- SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV);
- SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV);
- SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV);
- SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV);
- SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV);
- SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV);
- SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV);
- SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV);
- SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV);
- SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV);
- SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV);
- SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV);
- SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV);
- SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV);
- SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV);
- SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV);
- SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV);
- SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV);
- SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);
+ SET_VertexAttrib1sNV(dest, _mesa_VertexAttrib1sNV);
+ SET_VertexAttrib1dNV(dest, _mesa_VertexAttrib1dNV);
+ SET_VertexAttrib2sNV(dest, _mesa_VertexAttrib2sNV);
+ SET_VertexAttrib2dNV(dest, _mesa_VertexAttrib2dNV);
+ SET_VertexAttrib3sNV(dest, _mesa_VertexAttrib3sNV);
+ SET_VertexAttrib3dNV(dest, _mesa_VertexAttrib3dNV);
+ SET_VertexAttrib4sNV(dest, _mesa_VertexAttrib4sNV);
+ SET_VertexAttrib4dNV(dest, _mesa_VertexAttrib4dNV);
+ SET_VertexAttrib4ubNV(dest, _mesa_VertexAttrib4ubNV);
+ SET_VertexAttrib1svNV(dest, _mesa_VertexAttrib1svNV);
+ SET_VertexAttrib1dvNV(dest, _mesa_VertexAttrib1dvNV);
+ SET_VertexAttrib2svNV(dest, _mesa_VertexAttrib2svNV);
+ SET_VertexAttrib2dvNV(dest, _mesa_VertexAttrib2dvNV);
+ SET_VertexAttrib3svNV(dest, _mesa_VertexAttrib3svNV);
+ SET_VertexAttrib3dvNV(dest, _mesa_VertexAttrib3dvNV);
+ SET_VertexAttrib4svNV(dest, _mesa_VertexAttrib4svNV);
+ SET_VertexAttrib4dvNV(dest, _mesa_VertexAttrib4dvNV);
+ SET_VertexAttrib4ubvNV(dest, _mesa_VertexAttrib4ubvNV);
+ SET_VertexAttribs1svNV(dest, _mesa_VertexAttribs1svNV);
+ SET_VertexAttribs1fvNV(dest, _mesa_VertexAttribs1fvNV);
+ SET_VertexAttribs1dvNV(dest, _mesa_VertexAttribs1dvNV);
+ SET_VertexAttribs2svNV(dest, _mesa_VertexAttribs2svNV);
+ SET_VertexAttribs2fvNV(dest, _mesa_VertexAttribs2fvNV);
+ SET_VertexAttribs2dvNV(dest, _mesa_VertexAttribs2dvNV);
+ SET_VertexAttribs3svNV(dest, _mesa_VertexAttribs3svNV);
+ SET_VertexAttribs3fvNV(dest, _mesa_VertexAttribs3fvNV);
+ SET_VertexAttribs3dvNV(dest, _mesa_VertexAttribs3dvNV);
+ SET_VertexAttribs4svNV(dest, _mesa_VertexAttribs4svNV);
+ SET_VertexAttribs4fvNV(dest, _mesa_VertexAttribs4fvNV);
+ SET_VertexAttribs4dvNV(dest, _mesa_VertexAttribs4dvNV);
+ SET_VertexAttribs4ubvNV(dest, _mesa_VertexAttribs4ubvNV);
}
if (_mesa_is_desktop_gl(ctx)) {
- SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB);
- SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB);
- SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB);
- SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB);
- SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB);
- SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB);
- SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB);
- SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB);
- SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB);
- SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB);
- SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB);
- SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB);
- SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB);
- SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB);
- SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB);
- SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB);
- SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB);
- SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB);
- SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB);
- SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB);
- SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB);
- SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB);
- SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB);
- SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB);
- SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB);
- SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB);
- SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB);
- SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB);
+ SET_VertexAttrib1s(dest, _mesa_VertexAttrib1s);
+ SET_VertexAttrib1d(dest, _mesa_VertexAttrib1d);
+ SET_VertexAttrib2s(dest, _mesa_VertexAttrib2s);
+ SET_VertexAttrib2d(dest, _mesa_VertexAttrib2d);
+ SET_VertexAttrib3s(dest, _mesa_VertexAttrib3s);
+ SET_VertexAttrib3d(dest, _mesa_VertexAttrib3d);
+ SET_VertexAttrib4s(dest, _mesa_VertexAttrib4s);
+ SET_VertexAttrib4d(dest, _mesa_VertexAttrib4d);
+ SET_VertexAttrib1sv(dest, _mesa_VertexAttrib1sv);
+ SET_VertexAttrib1dv(dest, _mesa_VertexAttrib1dv);
+ SET_VertexAttrib2sv(dest, _mesa_VertexAttrib2sv);
+ SET_VertexAttrib2dv(dest, _mesa_VertexAttrib2dv);
+ SET_VertexAttrib3sv(dest, _mesa_VertexAttrib3sv);
+ SET_VertexAttrib3dv(dest, _mesa_VertexAttrib3dv);
+ SET_VertexAttrib4sv(dest, _mesa_VertexAttrib4sv);
+ SET_VertexAttrib4dv(dest, _mesa_VertexAttrib4dv);
+ SET_VertexAttrib4Nub(dest, _mesa_VertexAttrib4Nub);
+ SET_VertexAttrib4Nubv(dest, _mesa_VertexAttrib4Nubv);
+ SET_VertexAttrib4bv(dest, _mesa_VertexAttrib4bv);
+ SET_VertexAttrib4iv(dest, _mesa_VertexAttrib4iv);
+ SET_VertexAttrib4ubv(dest, _mesa_VertexAttrib4ubv);
+ SET_VertexAttrib4usv(dest, _mesa_VertexAttrib4usv);
+ SET_VertexAttrib4uiv(dest, _mesa_VertexAttrib4uiv);
+ SET_VertexAttrib4Nbv(dest, _mesa_VertexAttrib4Nbv);
+ SET_VertexAttrib4Nsv(dest, _mesa_VertexAttrib4Nsv);
+ SET_VertexAttrib4Nusv(dest, _mesa_VertexAttrib4Nusv);
+ SET_VertexAttrib4Niv(dest, _mesa_VertexAttrib4Niv);
+ SET_VertexAttrib4Nuiv(dest, _mesa_VertexAttrib4Nuiv);
/* GL_EXT_gpu_shader4, GL 3.0 */
- SET_VertexAttribI1ivEXT(dest, loopback_VertexAttribI1iv);
- SET_VertexAttribI1uivEXT(dest, loopback_VertexAttribI1uiv);
- SET_VertexAttribI4bvEXT(dest, loopback_VertexAttribI4bv);
- SET_VertexAttribI4svEXT(dest, loopback_VertexAttribI4sv);
- SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv);
- SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv);
+ SET_VertexAttribI1iv(dest, _mesa_VertexAttribI1iv);
+ SET_VertexAttribI1uiv(dest, _mesa_VertexAttribI1uiv);
+ SET_VertexAttribI4bv(dest, _mesa_VertexAttribI4bv);
+ SET_VertexAttribI4sv(dest, _mesa_VertexAttribI4sv);
+ SET_VertexAttribI4ubv(dest, _mesa_VertexAttribI4ubv);
+ SET_VertexAttribI4usv(dest, _mesa_VertexAttribI4usv);
}
}
diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h
index 879ad8995..c35d57bff 100644
--- a/mesalib/src/mesa/main/api_loopback.h
+++ b/mesalib/src/mesa/main/api_loopback.h
@@ -45,433 +45,433 @@ extern void
_mesa_loopback_init_api_table(const struct gl_context *ctx,
struct _glapi_table *dest);
void GLAPIENTRY
-loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue );
+_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue );
void GLAPIENTRY
-loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue );
+_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue );
void GLAPIENTRY
-loopback_Color3i_f( GLint red, GLint green, GLint blue );
+_mesa_Color3i( GLint red, GLint green, GLint blue );
void GLAPIENTRY
-loopback_Color3s_f( GLshort red, GLshort green, GLshort blue );
+_mesa_Color3s( GLshort red, GLshort green, GLshort blue );
void GLAPIENTRY
-loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue );
+_mesa_Color3ui( GLuint red, GLuint green, GLuint blue );
void GLAPIENTRY
-loopback_Color3us_f( GLushort red, GLushort green, GLushort blue );
+_mesa_Color3us( GLushort red, GLushort green, GLushort blue );
void GLAPIENTRY
-loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue );
+_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue );
void GLAPIENTRY
-loopback_Color3bv_f( const GLbyte *v );
+_mesa_Color3bv( const GLbyte *v );
void GLAPIENTRY
-loopback_Color3dv_f( const GLdouble *v );
+_mesa_Color3dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Color3iv_f( const GLint *v );
+_mesa_Color3iv( const GLint *v );
void GLAPIENTRY
-loopback_Color3sv_f( const GLshort *v );
+_mesa_Color3sv( const GLshort *v );
void GLAPIENTRY
-loopback_Color3uiv_f( const GLuint *v );
+_mesa_Color3uiv( const GLuint *v );
void GLAPIENTRY
-loopback_Color3usv_f( const GLushort *v );
+_mesa_Color3usv( const GLushort *v );
void GLAPIENTRY
-loopback_Color3ubv_f( const GLubyte *v );
+_mesa_Color3ubv( const GLubyte *v );
void GLAPIENTRY
-loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
+_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue,
GLbyte alpha );
void GLAPIENTRY
-loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
+_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue,
GLdouble alpha );
void GLAPIENTRY
-loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha );
+_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha );
void GLAPIENTRY
-loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
+_mesa_Color4s( GLshort red, GLshort green, GLshort blue,
GLshort alpha );
void GLAPIENTRY
-loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha );
+_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha );
void GLAPIENTRY
-loopback_Color4us_f( GLushort red, GLushort green, GLushort blue,
+_mesa_Color4us( GLushort red, GLushort green, GLushort blue,
GLushort alpha );
void GLAPIENTRY
-loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
+_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
void GLAPIENTRY
-loopback_Color4iv_f( const GLint *v );
+_mesa_Color4iv( const GLint *v );
void GLAPIENTRY
-loopback_Color4bv_f( const GLbyte *v );
+_mesa_Color4bv( const GLbyte *v );
void GLAPIENTRY
-loopback_Color4dv_f( const GLdouble *v );
+_mesa_Color4dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Color4sv_f( const GLshort *v);
+_mesa_Color4sv( const GLshort *v);
void GLAPIENTRY
-loopback_Color4uiv_f( const GLuint *v);
+_mesa_Color4uiv( const GLuint *v);
void GLAPIENTRY
-loopback_Color4usv_f( const GLushort *v);
+_mesa_Color4usv( const GLushort *v);
void GLAPIENTRY
-loopback_Color4ubv_f( const GLubyte *v);
+_mesa_Color4ubv( const GLubyte *v);
void GLAPIENTRY
-loopback_FogCoorddEXT( GLdouble d );
+_mesa_FogCoordd( GLdouble d );
void GLAPIENTRY
-loopback_FogCoorddvEXT( const GLdouble *v );
+_mesa_FogCoorddv( const GLdouble *v );
void GLAPIENTRY
-loopback_Indexd( GLdouble c );
+_mesa_Indexd( GLdouble c );
void GLAPIENTRY
-loopback_Indexi( GLint c );
+_mesa_Indexi( GLint c );
void GLAPIENTRY
-loopback_Indexs( GLshort c );
+_mesa_Indexs( GLshort c );
void GLAPIENTRY
-loopback_Indexub( GLubyte c );
+_mesa_Indexub( GLubyte c );
void GLAPIENTRY
-loopback_Indexdv( const GLdouble *c );
+_mesa_Indexdv( const GLdouble *c );
void GLAPIENTRY
-loopback_Indexiv( const GLint *c );
+_mesa_Indexiv( const GLint *c );
void GLAPIENTRY
-loopback_Indexsv( const GLshort *c );
+_mesa_Indexsv( const GLshort *c );
void GLAPIENTRY
-loopback_Indexubv( const GLubyte *c );
+_mesa_Indexubv( const GLubyte *c );
void GLAPIENTRY
-loopback_EdgeFlagv(const GLboolean *flag);
+_mesa_EdgeFlagv(const GLboolean *flag);
void GLAPIENTRY
-loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
void GLAPIENTRY
-loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
void GLAPIENTRY
-loopback_Normal3i( GLint nx, GLint ny, GLint nz );
+_mesa_Normal3i( GLint nx, GLint ny, GLint nz );
void GLAPIENTRY
-loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz );
+_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz );
void GLAPIENTRY
-loopback_Normal3bv( const GLbyte *v );
+_mesa_Normal3bv( const GLbyte *v );
void GLAPIENTRY
-loopback_Normal3dv( const GLdouble *v );
+_mesa_Normal3dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Normal3iv( const GLint *v );
+_mesa_Normal3iv( const GLint *v );
void GLAPIENTRY
-loopback_Normal3sv( const GLshort *v );
+_mesa_Normal3sv( const GLshort *v );
void GLAPIENTRY
-loopback_TexCoord1d( GLdouble s );
+_mesa_TexCoord1d( GLdouble s );
void GLAPIENTRY
-loopback_TexCoord1i( GLint s );
+_mesa_TexCoord1i( GLint s );
void GLAPIENTRY
-loopback_TexCoord1s( GLshort s );
+_mesa_TexCoord1s( GLshort s );
void GLAPIENTRY
-loopback_TexCoord2d( GLdouble s, GLdouble t );
+_mesa_TexCoord2d( GLdouble s, GLdouble t );
void GLAPIENTRY
-loopback_TexCoord2s( GLshort s, GLshort t );
+_mesa_TexCoord2s( GLshort s, GLshort t );
void GLAPIENTRY
-loopback_TexCoord2i( GLint s, GLint t );
+_mesa_TexCoord2i( GLint s, GLint t );
void GLAPIENTRY
-loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
void GLAPIENTRY
-loopback_TexCoord3i( GLint s, GLint t, GLint r );
+_mesa_TexCoord3i( GLint s, GLint t, GLint r );
void GLAPIENTRY
-loopback_TexCoord3s( GLshort s, GLshort t, GLshort r );
+_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r );
void GLAPIENTRY
-loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
void GLAPIENTRY
-loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
+_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
void GLAPIENTRY
-loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
void GLAPIENTRY
-loopback_TexCoord1dv( const GLdouble *v );
+_mesa_TexCoord1dv( const GLdouble *v );
void GLAPIENTRY
-loopback_TexCoord1iv( const GLint *v );
+_mesa_TexCoord1iv( const GLint *v );
void GLAPIENTRY
-loopback_TexCoord1sv( const GLshort *v );
+_mesa_TexCoord1sv( const GLshort *v );
void GLAPIENTRY
-loopback_TexCoord2dv( const GLdouble *v );
+_mesa_TexCoord2dv( const GLdouble *v );
void GLAPIENTRY
-loopback_TexCoord2iv( const GLint *v );
+_mesa_TexCoord2iv( const GLint *v );
void GLAPIENTRY
-loopback_TexCoord2sv( const GLshort *v );
+_mesa_TexCoord2sv( const GLshort *v );
void GLAPIENTRY
-loopback_TexCoord3dv( const GLdouble *v );
+_mesa_TexCoord3dv( const GLdouble *v );
void GLAPIENTRY
-loopback_TexCoord3iv( const GLint *v );
+_mesa_TexCoord3iv( const GLint *v );
void GLAPIENTRY
-loopback_TexCoord3sv( const GLshort *v );
+_mesa_TexCoord3sv( const GLshort *v );
void GLAPIENTRY
-loopback_TexCoord4dv( const GLdouble *v );
+_mesa_TexCoord4dv( const GLdouble *v );
void GLAPIENTRY
-loopback_TexCoord4iv( const GLint *v );
+_mesa_TexCoord4iv( const GLint *v );
void GLAPIENTRY
-loopback_TexCoord4sv( const GLshort *v );
+_mesa_TexCoord4sv( const GLshort *v );
void GLAPIENTRY
-loopback_Vertex2d( GLdouble x, GLdouble y );
+_mesa_Vertex2d( GLdouble x, GLdouble y );
void GLAPIENTRY
-loopback_Vertex2i( GLint x, GLint y );
+_mesa_Vertex2i( GLint x, GLint y );
void GLAPIENTRY
-loopback_Vertex2s( GLshort x, GLshort y );
+_mesa_Vertex2s( GLshort x, GLshort y );
void GLAPIENTRY
-loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
+_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
void GLAPIENTRY
-loopback_Vertex3i( GLint x, GLint y, GLint z );
+_mesa_Vertex3i( GLint x, GLint y, GLint z );
void GLAPIENTRY
-loopback_Vertex3s( GLshort x, GLshort y, GLshort z );
+_mesa_Vertex3s( GLshort x, GLshort y, GLshort z );
void GLAPIENTRY
-loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
void GLAPIENTRY
-loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w );
+_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w );
void GLAPIENTRY
-loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
void GLAPIENTRY
-loopback_Vertex2dv( const GLdouble *v );
+_mesa_Vertex2dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Vertex2iv( const GLint *v );
+_mesa_Vertex2iv( const GLint *v );
void GLAPIENTRY
-loopback_Vertex2sv( const GLshort *v );
+_mesa_Vertex2sv( const GLshort *v );
void GLAPIENTRY
-loopback_Vertex3dv( const GLdouble *v );
+_mesa_Vertex3dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Vertex3iv( const GLint *v );
+_mesa_Vertex3iv( const GLint *v );
void GLAPIENTRY
-loopback_Vertex3sv( const GLshort *v );
+_mesa_Vertex3sv( const GLshort *v );
void GLAPIENTRY
-loopback_Vertex4dv( const GLdouble *v );
+_mesa_Vertex4dv( const GLdouble *v );
void GLAPIENTRY
-loopback_Vertex4iv( const GLint *v );
+_mesa_Vertex4iv( const GLint *v );
void GLAPIENTRY
-loopback_Vertex4sv( const GLshort *v );
+_mesa_Vertex4sv( const GLshort *v );
void GLAPIENTRY
-loopback_MultiTexCoord1dARB(GLenum target, GLdouble s);
+_mesa_MultiTexCoord1d(GLenum target, GLdouble s);
void GLAPIENTRY
-loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
-loopback_MultiTexCoord1iARB(GLenum target, GLint s);
+_mesa_MultiTexCoord1i(GLenum target, GLint s);
void GLAPIENTRY
-loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord1iv(GLenum target, const GLint *v);
void GLAPIENTRY
-loopback_MultiTexCoord1sARB(GLenum target, GLshort s);
+_mesa_MultiTexCoord1s(GLenum target, GLshort s);
void GLAPIENTRY
-loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v);
void GLAPIENTRY
-loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t);
void GLAPIENTRY
-loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
-loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t);
void GLAPIENTRY
-loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord2iv(GLenum target, const GLint *v);
void GLAPIENTRY
-loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t);
void GLAPIENTRY
-loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v);
void GLAPIENTRY
-loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r);
void GLAPIENTRY
-loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
-loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r);
void GLAPIENTRY
-loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord3iv(GLenum target, const GLint *v);
void GLAPIENTRY
-loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r);
void GLAPIENTRY
-loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v);
void GLAPIENTRY
-loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r,
+_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r,
GLdouble q);
void GLAPIENTRY
-loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
-loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q);
void GLAPIENTRY
-loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v);
+_mesa_MultiTexCoord4iv(GLenum target, const GLint *v);
void GLAPIENTRY
-loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r,
+_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r,
GLshort q);
void GLAPIENTRY
-loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v);
+_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v);
void GLAPIENTRY
-loopback_EvalCoord2dv( const GLdouble *u );
+_mesa_EvalCoord2dv( const GLdouble *u );
void GLAPIENTRY
-loopback_EvalCoord2fv( const GLfloat *u );
+_mesa_EvalCoord2fv( const GLfloat *u );
void GLAPIENTRY
-loopback_EvalCoord2d( GLdouble u, GLdouble v );
+_mesa_EvalCoord2d( GLdouble u, GLdouble v );
void GLAPIENTRY
-loopback_EvalCoord1dv( const GLdouble *u );
+_mesa_EvalCoord1dv( const GLdouble *u );
void GLAPIENTRY
-loopback_EvalCoord1fv( const GLfloat *u );
+_mesa_EvalCoord1fv( const GLfloat *u );
void GLAPIENTRY
-loopback_EvalCoord1d( GLdouble u );
+_mesa_EvalCoord1d( GLdouble u );
void GLAPIENTRY
-loopback_Materialf( GLenum face, GLenum pname, GLfloat param );
+_mesa_Materialf( GLenum face, GLenum pname, GLfloat param );
void GLAPIENTRY
-loopback_Materiali(GLenum face, GLenum pname, GLint param );
+_mesa_Materiali(GLenum face, GLenum pname, GLint param );
void GLAPIENTRY
-loopback_Materialiv(GLenum face, GLenum pname, const GLint *params );
+_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params );
void GLAPIENTRY
-loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
void GLAPIENTRY
-loopback_Rectdv(const GLdouble *v1, const GLdouble *v2);
+_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2);
void GLAPIENTRY
-loopback_Rectfv(const GLfloat *v1, const GLfloat *v2);
+_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2);
void GLAPIENTRY
-loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
+_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
void GLAPIENTRY
-loopback_Rectiv(const GLint *v1, const GLint *v2);
+_mesa_Rectiv(const GLint *v1, const GLint *v2);
void GLAPIENTRY
-loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
void GLAPIENTRY
-loopback_Rectsv(const GLshort *v1, const GLshort *v2);
+_mesa_Rectsv(const GLshort *v1, const GLshort *v2);
void GLAPIENTRY
-loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue );
+_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue );
void GLAPIENTRY
-loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue );
+_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue );
void GLAPIENTRY
-loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue );
+_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue );
void GLAPIENTRY
-loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue );
+_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue );
void GLAPIENTRY
-loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue );
+_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue );
void GLAPIENTRY
-loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue );
+_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue );
void GLAPIENTRY
-loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue );
+_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue );
void GLAPIENTRY
-loopback_SecondaryColor3bvEXT_f( const GLbyte *v );
+_mesa_SecondaryColor3bv( const GLbyte *v );
void GLAPIENTRY
-loopback_SecondaryColor3dvEXT_f( const GLdouble *v );
+_mesa_SecondaryColor3dv( const GLdouble *v );
void GLAPIENTRY
-loopback_SecondaryColor3ivEXT_f( const GLint *v );
+_mesa_SecondaryColor3iv( const GLint *v );
void GLAPIENTRY
-loopback_SecondaryColor3svEXT_f( const GLshort *v );
+_mesa_SecondaryColor3sv( const GLshort *v );
void GLAPIENTRY
-loopback_SecondaryColor3uivEXT_f( const GLuint *v );
+_mesa_SecondaryColor3uiv( const GLuint *v );
void GLAPIENTRY
-loopback_SecondaryColor3usvEXT_f( const GLushort *v );
+_mesa_SecondaryColor3usv( const GLushort *v );
void GLAPIENTRY
-loopback_SecondaryColor3ubvEXT_f( const GLubyte *v );
+_mesa_SecondaryColor3ubv( const GLubyte *v );
void GLAPIENTRY
-loopback_VertexAttrib1sNV(GLuint index, GLshort x);
+_mesa_VertexAttrib1sNV(GLuint index, GLshort x);
void GLAPIENTRY
-loopback_VertexAttrib1dNV(GLuint index, GLdouble x);
+_mesa_VertexAttrib1dNV(GLuint index, GLdouble x);
void GLAPIENTRY
-loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
+_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
void GLAPIENTRY
-loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
+_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
void GLAPIENTRY
-loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
+_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
-loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
+_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
-loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
+_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
GLshort w);
void GLAPIENTRY
-loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
+_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
GLdouble w);
void GLAPIENTRY
-loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
+_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
GLubyte w);
void GLAPIENTRY
-loopback_VertexAttrib1svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib2svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib3svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib4svNV(GLuint index, const GLshort *v);
+_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
+_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
void GLAPIENTRY
-loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
-loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
-loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
-loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
+_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
+_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
-loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
+_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
+_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
void GLAPIENTRY
-loopback_VertexAttrib1sARB(GLuint index, GLshort x);
+_mesa_VertexAttrib1s(GLuint index, GLshort x);
void GLAPIENTRY
-loopback_VertexAttrib1dARB(GLuint index, GLdouble x);
+_mesa_VertexAttrib1d(GLuint index, GLdouble x);
void GLAPIENTRY
-loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y);
+_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y);
void GLAPIENTRY
-loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y);
+_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y);
void GLAPIENTRY
-loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z);
+_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
-loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z);
+_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
-loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z,
+_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z,
GLshort w);
void GLAPIENTRY
-loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z,
+_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z,
GLdouble w);
void GLAPIENTRY
-loopback_VertexAttrib1svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib1sv(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib2svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib2sv(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib3svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib3sv(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib4svARB(GLuint index, const GLshort *v);
+_mesa_VertexAttrib4sv(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v);
+_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
-loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v);
+_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v);
void GLAPIENTRY
-loopback_VertexAttrib4ivARB(GLuint index, const GLint * v);
+_mesa_VertexAttrib4iv(GLuint index, const GLint * v);
void GLAPIENTRY
-loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v);
+_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v);
void GLAPIENTRY
-loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v);
+_mesa_VertexAttrib4usv(GLuint index, const GLushort * v);
void GLAPIENTRY
-loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v);
+_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v);
void GLAPIENTRY
-loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v);
+_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v);
void GLAPIENTRY
-loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v);
+_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v);
void GLAPIENTRY
-loopback_VertexAttrib4NivARB(GLuint index, const GLint * v);
+_mesa_VertexAttrib4Niv(GLuint index, const GLint * v);
void GLAPIENTRY
-loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z,
+_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z,
GLubyte w);
void GLAPIENTRY
-loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v);
+_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v);
void GLAPIENTRY
-loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v);
+_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v);
void GLAPIENTRY
-loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v);
+_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v);
void GLAPIENTRY
-loopback_VertexAttribI1iv(GLuint index, const GLint *v);
+_mesa_VertexAttribI1iv(GLuint index, const GLint *v);
void GLAPIENTRY
-loopback_VertexAttribI1uiv(GLuint index, const GLuint *v);
+_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v);
void GLAPIENTRY
-loopback_VertexAttribI4bv(GLuint index, const GLbyte *v);
+_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v);
void GLAPIENTRY
-loopback_VertexAttribI4sv(GLuint index, const GLshort *v);
+_mesa_VertexAttribI4sv(GLuint index, const GLshort *v);
void GLAPIENTRY
-loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v);
+_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v);
void GLAPIENTRY
-loopback_VertexAttribI4usv(GLuint index, const GLushort *v);
+_mesa_VertexAttribI4usv(GLuint index, const GLushort *v);
#endif /* API_LOOPBACK_H */
diff --git a/mesalib/src/mesa/main/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c
index 9be86c2fe..8150b5f4e 100644
--- a/mesalib/src/mesa/main/arbprogram.c
+++ b/mesalib/src/mesa/main/arbprogram.c
@@ -46,7 +46,7 @@
* and glBindProgramARB.
*/
void GLAPIENTRY
-_mesa_BindProgram(GLenum target, GLuint id)
+_mesa_BindProgramARB(GLenum target, GLuint id)
{
struct gl_program *curProg, *newProg;
GET_CURRENT_CONTEXT(ctx);
@@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
* \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
*/
void GLAPIENTRY
-_mesa_DeletePrograms(GLsizei n, const GLuint *ids)
+_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
if (ctx->VertexProgram.Current &&
ctx->VertexProgram.Current->Base.Id == ids[i]) {
/* unbind this currently bound program */
- _mesa_BindProgram(prog->Target, 0);
+ _mesa_BindProgramARB(prog->Target, 0);
}
break;
case GL_FRAGMENT_PROGRAM_ARB:
if (ctx->FragmentProgram.Current &&
ctx->FragmentProgram.Current->Base.Id == ids[i]) {
/* unbind this currently bound program */
- _mesa_BindProgram(prog->Target, 0);
+ _mesa_BindProgramARB(prog->Target, 0);
}
break;
default:
@@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
* \note Called by both glGenProgramsNV and glGenProgramsARB.
*/
void GLAPIENTRY
-_mesa_GenPrograms(GLsizei n, GLuint *ids)
+_mesa_GenProgramsARB(GLsizei n, GLuint *ids)
{
GLuint first;
GLuint i;
diff --git a/mesalib/src/mesa/main/arbprogram.h b/mesalib/src/mesa/main/arbprogram.h
index e2e535e91..4f40a70c5 100644
--- a/mesalib/src/mesa/main/arbprogram.h
+++ b/mesalib/src/mesa/main/arbprogram.h
@@ -31,13 +31,13 @@
extern void GLAPIENTRY
-_mesa_BindProgram(GLenum target, GLuint id);
+_mesa_BindProgramARB(GLenum target, GLuint id);
extern void GLAPIENTRY
-_mesa_DeletePrograms(GLsizei n, const GLuint *ids);
+_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids);
extern void GLAPIENTRY
-_mesa_GenPrograms(GLsizei n, GLuint *ids);
+_mesa_GenProgramsARB(GLsizei n, GLuint *ids);
extern GLboolean GLAPIENTRY
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c
index 926c753dd..a909e0eff 100644
--- a/mesalib/src/mesa/main/arrayobj.c
+++ b/mesalib/src/mesa/main/arrayobj.c
@@ -431,7 +431,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
* \param ids Array of \c n array object IDs.
*/
void GLAPIENTRY
-_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
+_mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
GLsizei i;
@@ -541,7 +541,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
* \c GL_FALSE otherwise.
*/
GLboolean GLAPIENTRY
-_mesa_IsVertexArrayAPPLE( GLuint id )
+_mesa_IsVertexArray( GLuint id )
{
struct gl_array_object * obj;
GET_CURRENT_CONTEXT(ctx);
diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h
index dfefec2a7..0d58bb75a 100644
--- a/mesalib/src/mesa/main/arrayobj.h
+++ b/mesalib/src/mesa/main/arrayobj.h
@@ -110,12 +110,12 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
-void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
+void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
-GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
+GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
#endif /* ARRAYOBJ_H */
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c
index 0997e5407..acb33885a 100644
--- a/mesalib/src/mesa/main/attrib.c
+++ b/mesalib/src/mesa/main/attrib.c
@@ -618,7 +618,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
const GLbitfield genEnabled = enable->TexGen[i];
if (ctx->Texture.Unit[i].Enabled != enabled) {
- _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+ _mesa_ActiveTexture(GL_TEXTURE0 + i);
_mesa_set_enable(ctx, GL_TEXTURE_1D, !!(enabled & TEXTURE_1D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_2D, !!(enabled & TEXTURE_2D_BIT));
@@ -640,7 +640,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
}
if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
- _mesa_ActiveTextureARB(GL_TEXTURE0 + i);
+ _mesa_ActiveTexture(GL_TEXTURE0 + i);
_mesa_set_enable(ctx, GL_TEXTURE_GEN_S, !!(genEnabled & S_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_GEN_T, !!(genEnabled & T_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_GEN_R, !!(genEnabled & R_BIT));
@@ -648,7 +648,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
}
}
- _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
+ _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
}
@@ -666,7 +666,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
const struct gl_texture_unit *unit = &texstate->Texture.Unit[u];
GLuint tgt;
- _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
+ _mesa_ActiveTexture(GL_TEXTURE0_ARB + u);
_mesa_set_enable(ctx, GL_TEXTURE_1D, !!(unit->Enabled & TEXTURE_1D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT));
@@ -808,7 +808,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
}
}
- _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
+ _mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
_mesa_reference_shared_state(ctx, &texstate->SharedRef, NULL);
@@ -879,7 +879,7 @@ _mesa_PopAttrib(void)
else {
GLuint i;
for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
- _mesa_ColorMaskIndexed(i,
+ _mesa_ColorMaski(i,
(GLboolean) (color->ColorMask[i][0] != 0),
(GLboolean) (color->ColorMask[i][1] != 0),
(GLboolean) (color->ColorMask[i][2] != 0),
@@ -910,7 +910,7 @@ _mesa_PopAttrib(void)
* to record that error. Per OpenGL ARB decision.
*/
if (multipleBuffers)
- _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers,
+ _mesa_DrawBuffers(ctx->Const.MaxDrawBuffers,
color->DrawBuffer);
else
_mesa_DrawBuffer(color->DrawBuffer[0]);
@@ -934,18 +934,18 @@ _mesa_PopAttrib(void)
/* set blend per buffer */
GLuint buf;
for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
- _mesa_BlendFuncSeparatei(buf, color->Blend[buf].SrcRGB,
+ _mesa_BlendFuncSeparateiARB(buf, color->Blend[buf].SrcRGB,
color->Blend[buf].DstRGB,
color->Blend[buf].SrcA,
color->Blend[buf].DstA);
- _mesa_BlendEquationSeparatei(buf,
+ _mesa_BlendEquationSeparateiARB(buf,
color->Blend[buf].EquationRGB,
color->Blend[buf].EquationA);
}
}
else {
/* set same blend modes for all buffers */
- _mesa_BlendFuncSeparateEXT(color->Blend[0].SrcRGB,
+ _mesa_BlendFuncSeparate(color->Blend[0].SrcRGB,
color->Blend[0].DstRGB,
color->Blend[0].SrcA,
color->Blend[0].DstA);
@@ -957,7 +957,7 @@ _mesa_PopAttrib(void)
_mesa_BlendEquation(color->Blend[0].EquationRGB);
}
else {
- _mesa_BlendEquationSeparateEXT(
+ _mesa_BlendEquationSeparate(
color->Blend[0].EquationRGB,
color->Blend[0].EquationA);
}
@@ -972,8 +972,8 @@ _mesa_PopAttrib(void)
_mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
color->IndexLogicOpEnabled);
_mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
- _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
+ _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
+ _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
/* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
if (ctx->Extensions.EXT_framebuffer_sRGB)
@@ -1100,7 +1100,7 @@ _mesa_PopAttrib(void)
/* materials */
memcpy(&ctx->Light.Material, &light->Material,
sizeof(struct gl_material));
- _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
+ _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
}
break;
case GL_LINE_BIT:
@@ -1293,7 +1293,7 @@ _mesa_PopAttrib(void)
ms->SampleAlphaToOne,
GL_SAMPLE_ALPHA_TO_ONE);
- _mesa_SampleCoverageARB(ms->SampleCoverageValue,
+ _mesa_SampleCoverage(ms->SampleCoverageValue,
ms->SampleCoverageInvert);
}
break;
@@ -1432,7 +1432,7 @@ restore_array_attrib(struct gl_context *ctx,
const bool arb_vao = (src->ArrayObj->Name != 0
&& src->ArrayObj->ARBsemantics);
- if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name))
+ if (arb_vao && !_mesa_IsVertexArray(src->ArrayObj->Name))
return;
_mesa_BindVertexArrayAPPLE(src->ArrayObj->Name);
@@ -1440,11 +1440,11 @@ restore_array_attrib(struct gl_context *ctx,
/* Restore or recreate the buffer objects by the names ... */
if (!arb_vao
|| src->ArrayBufferObj->Name == 0
- || _mesa_IsBufferARB(src->ArrayBufferObj->Name)) {
+ || _mesa_IsBuffer(src->ArrayBufferObj->Name)) {
/* ... and restore its content */
copy_array_attrib(ctx, dest, src, false);
- _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
+ _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB,
src->ArrayBufferObj->Name);
} else {
copy_array_attrib(ctx, dest, src, true);
@@ -1452,8 +1452,8 @@ restore_array_attrib(struct gl_context *ctx,
if (!arb_vao
|| src->ArrayObj->ElementArrayBufferObj->Name == 0
- || _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name))
- _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB,
+ || _mesa_IsBuffer(src->ArrayObj->ElementArrayBufferObj->Name))
+ _mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,
src->ArrayObj->ElementArrayBufferObj->Name);
}
diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c
index 5cd3ce244..1930b1c37 100644
--- a/mesalib/src/mesa/main/blend.c
+++ b/mesalib/src/mesa/main/blend.c
@@ -170,7 +170,7 @@ validate_blend_factors(struct gl_context *ctx, const char *func,
void GLAPIENTRY
_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
{
- _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);
+ _mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor);
}
static GLboolean
@@ -201,7 +201,7 @@ update_uses_dual_src(struct gl_context *ctx, int buf)
* \param dfactorA alpha destination factor operator.
*/
void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA )
{
GLuint buf, numBuffers;
@@ -260,9 +260,9 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
* Set blend source/dest factors for one color buffer/target.
*/
void GLAPIENTRY
-_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
+_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor)
{
- _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor);
+ _mesa_BlendFuncSeparateiARB(buf, sfactor, dfactor, sfactor, dfactor);
}
@@ -270,7 +270,7 @@ _mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
* Set separate blend source/dest factors for one color buffer/target.
*/
void GLAPIENTRY
-_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA)
{
GET_CURRENT_CONTEXT(ctx);
@@ -384,7 +384,7 @@ _mesa_BlendEquation( GLenum mode )
* Set blend equation for one color buffer/target.
*/
void GLAPIENTRY
-_mesa_BlendEquationi(GLuint buf, GLenum mode)
+_mesa_BlendEquationiARB(GLuint buf, GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -419,7 +419,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode)
void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
+_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA )
{
GLuint buf, numBuffers;
GLboolean changed;
@@ -477,7 +477,7 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
* Set separate blend equations for one color buffer/target.
*/
void GLAPIENTRY
-_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)
+_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -730,7 +730,7 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
* For GL_EXT_draw_buffers2 and GL3
*/
void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
+_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha )
{
GLubyte tmp[4];
@@ -766,7 +766,7 @@ _mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp)
+_mesa_ClampColor(GLenum target, GLenum clamp)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/mesalib/src/mesa/main/blend.h b/mesalib/src/mesa/main/blend.h
index d74f17ef1..a539aa809 100644
--- a/mesalib/src/mesa/main/blend.h
+++ b/mesalib/src/mesa/main/blend.h
@@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
extern void GLAPIENTRY
-_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA );
extern void GLAPIENTRY
-_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor);
+_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
extern void GLAPIENTRY
-_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
+_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA);
@@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode );
extern void GLAPIENTRY
-_mesa_BlendEquationi(GLuint buf, GLenum mode);
+_mesa_BlendEquationiARB(GLuint buf, GLenum mode);
extern void GLAPIENTRY
-_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA );
+_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA );
extern void GLAPIENTRY
-_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA);
+_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA);
extern void GLAPIENTRY
@@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha );
extern void GLAPIENTRY
-_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
+_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha );
extern void GLAPIENTRY
-_mesa_ClampColorARB(GLenum target, GLenum clamp);
+_mesa_ClampColor(GLenum target, GLenum clamp);
extern void
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 9dba99daf..dbcd0e6e6 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -819,7 +819,7 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver)
/**********************************************************************/
void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer)
+_mesa_BindBuffer(GLenum target, GLuint buffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -839,7 +839,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
* \param ids Array of \c n buffer object IDs.
*/
void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
+_mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
GLsizei i;
@@ -874,23 +874,23 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
}
if (ctx->Array.ArrayBufferObj == bufObj) {
- _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
+ _mesa_BindBuffer( GL_ARRAY_BUFFER_ARB, 0 );
}
if (arrayObj->ElementArrayBufferObj == bufObj) {
- _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
+ _mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
}
/* unbind ARB_copy_buffer binding points */
if (ctx->CopyReadBuffer == bufObj) {
- _mesa_BindBufferARB( GL_COPY_READ_BUFFER, 0 );
+ _mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 );
}
if (ctx->CopyWriteBuffer == bufObj) {
- _mesa_BindBufferARB( GL_COPY_WRITE_BUFFER, 0 );
+ _mesa_BindBuffer( GL_COPY_WRITE_BUFFER, 0 );
}
/* unbind transform feedback binding points */
if (ctx->TransformFeedback.CurrentBuffer == bufObj) {
- _mesa_BindBufferARB( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
+ _mesa_BindBuffer( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
}
for (j = 0; j < MAX_FEEDBACK_BUFFERS; j++) {
if (ctx->TransformFeedback.CurrentObject->Buffers[j] == bufObj) {
@@ -906,19 +906,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
}
if (ctx->UniformBuffer == bufObj) {
- _mesa_BindBufferARB( GL_UNIFORM_BUFFER, 0 );
+ _mesa_BindBuffer( GL_UNIFORM_BUFFER, 0 );
}
/* unbind any pixel pack/unpack pointers bound to this buffer */
if (ctx->Pack.BufferObj == bufObj) {
- _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
+ _mesa_BindBuffer( GL_PIXEL_PACK_BUFFER_EXT, 0 );
}
if (ctx->Unpack.BufferObj == bufObj) {
- _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
+ _mesa_BindBuffer( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
}
if (ctx->Texture.BufferObject == bufObj) {
- _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 );
+ _mesa_BindBuffer( GL_TEXTURE_BUFFER, 0 );
}
/* The ID is immediately freed for re-use */
@@ -949,7 +949,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
* \param buffer Array of \c n locations to store the IDs.
*/
void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
+_mesa_GenBuffers(GLsizei n, GLuint *buffer)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@@ -994,7 +994,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
* \c GL_FALSE otherwise.
*/
GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint id)
+_mesa_IsBuffer(GLuint id)
{
struct gl_buffer_object *bufObj;
GET_CURRENT_CONTEXT(ctx);
@@ -1009,7 +1009,7 @@ _mesa_IsBufferARB(GLuint id)
void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
+_mesa_BufferData(GLenum target, GLsizeiptrARB size,
const GLvoid * data, GLenum usage)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1089,7 +1089,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
+_mesa_BufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, const GLvoid * data)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1114,7 +1114,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
+_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, void * data)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1134,7 +1134,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access)
+_mesa_MapBuffer(GLenum target, GLenum access)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object * bufObj;
@@ -1229,7 +1229,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target)
+_mesa_UnmapBuffer(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
@@ -1292,7 +1292,7 @@ _mesa_UnmapBufferARB(GLenum target)
void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
+_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
@@ -1395,7 +1395,7 @@ invalid_pname:
void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
+_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object * bufObj;
diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index 4d5446ac0..e98e47670 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -101,29 +101,29 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver);
*/
void GLAPIENTRY
-_mesa_BindBufferARB(GLenum target, GLuint buffer);
+_mesa_BindBuffer(GLenum target, GLuint buffer);
void GLAPIENTRY
-_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
+_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
void GLAPIENTRY
-_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
+_mesa_GenBuffers(GLsizei n, GLuint * buffer);
GLboolean GLAPIENTRY
-_mesa_IsBufferARB(GLuint buffer);
+_mesa_IsBuffer(GLuint buffer);
void GLAPIENTRY
-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
+_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
void GLAPIENTRY
-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
+_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
void GLAPIENTRY
-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
+_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
void * GLAPIENTRY
-_mesa_MapBufferARB(GLenum target, GLenum access);
+_mesa_MapBuffer(GLenum target, GLenum access);
GLboolean GLAPIENTRY
-_mesa_UnmapBufferARB(GLenum target);
+_mesa_UnmapBuffer(GLenum target);
void GLAPIENTRY
-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
+_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
void GLAPIENTRY
_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
void GLAPIENTRY
-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
+_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
void GLAPIENTRY
_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
GLintptr readOffset, GLintptr writeOffset,
diff --git a/mesalib/src/mesa/main/buffers.c b/mesalib/src/mesa/main/buffers.c
index cc268b67c..fd430aad0 100644
--- a/mesalib/src/mesa/main/buffers.c
+++ b/mesalib/src/mesa/main/buffers.c
@@ -206,7 +206,7 @@ read_buffer_enum_to_index(GLenum buffer)
* Called by glDrawBuffer().
* Specify which renderbuffer(s) to draw into for the first color output.
* <buffer> can name zero, one, two or four renderbuffers!
- * \sa _mesa_DrawBuffersARB
+ * \sa _mesa_DrawBuffers
*
* \param buffer buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc.
*
@@ -280,7 +280,7 @@ _mesa_DrawBuffer(GLenum buffer)
* GL_FRONT_AND_BACK is illegal.
*/
void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
+_mesa_DrawBuffers(GLsizei n, const GLenum *buffers)
{
GLint output;
GLbitfield usedBufferMask, supportedMask;
diff --git a/mesalib/src/mesa/main/buffers.h b/mesalib/src/mesa/main/buffers.h
index 8083bc3d3..e9768f944 100644
--- a/mesalib/src/mesa/main/buffers.h
+++ b/mesalib/src/mesa/main/buffers.h
@@ -41,7 +41,7 @@ extern void GLAPIENTRY
_mesa_DrawBuffer( GLenum mode );
extern void GLAPIENTRY
-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
+_mesa_DrawBuffers(GLsizei n, const GLenum *buffers);
extern void
_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index a8cddaf8f..b22b99485 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -183,9 +183,7 @@ extern "C" {
* Don't define it if using a newer Windows compiler.
*/
#ifndef __FUNCTION__
-# if defined(__VMS)
-# define __FUNCTION__ "VMS$NL:"
-# elif !defined(__GNUC__) && !defined(__xlC__) && \
+# if !defined(__GNUC__) && !defined(__xlC__) && \
(!defined(_MSC_VER) || _MSC_VER < 1300)
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
@@ -363,7 +361,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
defined(__arm__) || \
defined(__sh__) || defined(__m32r__) || \
(defined(__sun) && defined(_IEEE_754)) || \
- (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
+ (defined(__alpha__) && defined(__IEEE_FLOAT))
#define USE_IEEE
#define IEEE_ONE 0x3f800000
#endif
diff --git a/mesalib/src/mesa/main/descrip.mms b/mesalib/src/mesa/main/descrip.mms
deleted file mode 100644
index 91d7225c3..000000000
--- a/mesalib/src/mesa/main/descrip.mms
+++ /dev/null
@@ -1,258 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 29 September 2008
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define shader [-.shader]
- define glapi [-.glapi]
- define main [-.main]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.glapi],[-.shader]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =accum.c \
- api_arrayelt.c \
- api_exec.c \
- api_loopback.c \
- api_noop.c \
- api_validate.c \
- attrib.c \
- arrayobj.c \
- blend.c \
- bufferobj.c \
- buffers.c \
- clear.c \
- clip.c \
- colortab.c \
- context.c \
- convolve.c \
- debug.c \
- depth.c \
- depthstencil.c \
- dlist.c \
- drawpix.c \
- enable.c \
- enums.c \
- errors.c \
- eval.c \
- execmem.c \
- extensions.c \
- fbobject.c \
- feedback.c \
- ffvertex_prog.c \
- fog.c \
- framebuffer.c \
- get.c \
- getstring.c \
- hash.c \
- hint.c \
- histogram.c \
- image.c \
- imports.c \
- light.c \
- lines.c \
- matrix.c \
- mipmap.c \
- mm.c \
- multisample.c \
- pixel.c \
- pixelstore.c \
- points.c \
- polygon.c \
- rastpos.c \
- rbadaptors.c \
- readpix.c \
- renderbuffer.c \
- scissor.c \
- shaders.c \
- state.c \
- stencil.c \
- texcompress.c \
- texcompress_fxt1.c \
- texcompress_s3tc.c \
- texenv.c \
- texenvprogram.c \
- texformat.c \
- texgen.c \
- teximage.c \
- texobj.c \
- texparam.c \
- texrender.c \
- texstate.c \
- texstore.c \
- varray.c \
- vtxfmt.c \
- queryobj.c \
- rbadaptors.c
-
-OBJECTS=accum.obj,\
-api_arrayelt.obj,\
-api_exec.obj,\
-api_loopback.obj,\
-api_noop.obj,\
-api_validate.obj,\
-arrayobj.obj,\
-attrib.obj,\
-blend.obj,\
-bufferobj.obj,\
-buffers.obj,\
-clear.obj,\
-clip.obj,\
-colortab.obj,\
-context.obj,\
-convolve.obj,\
-debug.obj,\
-depth.obj,\
-depthstencil.obj,\
-dlist.obj,\
-drawpix.obj,\
-enable.obj,\
-enums.obj,\
-errors.obj,\
-eval.obj,\
-execmem.obj,\
-extensions.obj,\
-fbobject.obj,\
-feedback.obj,\
-ffvertex_prog.obj,\
-fog.obj,\
-framebuffer.obj,\
-get.obj,\
-getstring.obj,\
-hash.obj,\
-hint.obj,\
-histogram.obj,\
-image.obj,\
-imports.obj,\
-light.obj,\
-lines.obj,\
-matrix.obj,\
-mipmap.obj,\
-mm.obj,\
-multisample.obj,\
-pixel.obj,\
-pixelstore.obj,\
-points.obj,\
-polygon.obj,\
-rastpos.obj,\
-readpix.obj,\
-renderbuffer.obj,\
-scissor.obj,\
-shaders.obj,\
-state.obj,\
-stencil.obj,\
-texcompress.obj,\
-texcompress_fxt1.obj,\
-texcompress_s3tc.obj,\
-texenv.obj,\
-texenvprogram.obj,\
-texformat.obj,\
-texgen.obj,\
-teximage.obj,\
-texobj.obj,\
-texparam.obj,\
-texrender.obj,\
-texstate.obj,\
-texstore.obj,\
-varray.obj,\
-vtxfmt.obj,\
-queryobj.obj,\
-rbadaptors.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ $(MAKELIB) $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-accum.obj : accum.c
-api_arrayelt.obj : api_arrayelt.c
-api_loopback.obj : api_loopback.c
-api_noop.obj : api_noop.c
-api_validate.obj : api_validate.c
-arrayobj.obj : arrayobj.c
-attrib.obj : attrib.c
-blend.obj : blend.c
-bufferobj.obj : bufferobj.c
-buffers.obj : buffers.c
-clip.obj : clip.c
-colortab.obj : colortab.c
-context.obj : context.c
-convolve.obj : convolve.c
-debug.obj : debug.c
-depth.obj : depth.c
-depthstencil.obj : depthstencil.c
-dlist.obj : dlist.c
-drawpix.obj : drawpix.c
-enable.obj : enable.c
-enums.obj : enums.c
-errors.obj : errors.c
-eval.obj : eval.c
-execmem.obj : execmem.c
-extensions.obj : extensions.c
-fbobject.obj : fbobject.c
-feedback.obj : feedback.c
-fog.obj : fog.c
-framebuffer.obj : framebuffer.c
-get.obj : get.c
-getstring.obj : getstring.c
-hash.obj : hash.c
-hint.obj : hint.c
-histogram.obj : histogram.c
-image.obj : image.c
-imports.obj : imports.c vsnprintf.c
-light.obj : light.c
-lines.obj : lines.c
-matrix.obj : matrix.c
-mipmap.obj : mipmap.c
-mm.obj : mm.c
-pixel.obj : pixel.c
-points.obj : points.c
-polygon.obj : polygon.c
-rastpos.obj : rastpos.c
-rbadaptors.obj : rbadaptors.c
-renderbuffer.obj : renderbuffer.c
-state.obj : state.c
-stencil.obj : stencil.c
-texcompress.obj : texcompress.c
-texcompress_fxt1.obj : texcompress_fxt1.c
- cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c
-texcompress_s3tc.obj : texcompress_s3tc.c
-texenvprogram.obj : texenvprogram.c
-texformat.obj : texformat.c
-teximage.obj : teximage.c
-texobj.obj : texobj.c
-texrender.obj : texrender.c
-texstate.obj : texstate.c
-texstore.obj : texstore.c
-varray.obj : varray.c
-vtxfmt.obj : vtxfmt.c
-shaders.obj : shaders.c
-queryobj.obj : queryobj.c
-rbadaptors.obj : rbadaptors.c
-clear.obj : clear.c
-multisample.obj : multisample.c
-scissor.obj : scissor.c
-texenv.obj : texenv.c
-texgen.obj : texgen.c
-texparam.obj : texparam.c
-readpix.obj : readpix.c
-ffvertex_prog.obj : ffvertex_prog.c
-api_exec.obj : api_exec.c
-pixelstore.obj : pixelstore.c
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 8bbead7c4..6b99f35bb 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -1152,7 +1152,7 @@ save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA)
n[2].e = modeA;
}
if (ctx->ExecuteFlag) {
- CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA));
+ CALL_BlendEquationSeparate(ctx->Exec, (modeRGB, modeA));
}
}
@@ -1172,7 +1172,7 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB,
n[4].e = dfactorA;
}
if (ctx->ExecuteFlag) {
- CALL_BlendFuncSeparateEXT(ctx->Exec,
+ CALL_BlendFuncSeparate(ctx->Exec,
(sfactorRGB, dfactorRGB, sfactorA, dfactorA));
}
}
@@ -1703,7 +1703,7 @@ save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green,
n[5].b = alpha;
}
if (ctx->ExecuteFlag) {
- /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/
+ /*CALL_ColorMaski(ctx->Exec, (buf, red, green, blue, alpha));*/
}
}
@@ -2276,7 +2276,7 @@ save_DisableIndexed(GLuint index, GLenum cap)
n[2].e = cap;
}
if (ctx->ExecuteFlag) {
- CALL_DisableIndexedEXT(ctx->Exec, (index, cap));
+ CALL_Disablei(ctx->Exec, (index, cap));
}
}
@@ -2351,7 +2351,7 @@ save_EnableIndexed(GLuint index, GLenum cap)
n[2].e = cap;
}
if (ctx->ExecuteFlag) {
- CALL_EnableIndexedEXT(ctx->Exec, (index, cap));
+ CALL_Enablei(ctx->Exec, (index, cap));
}
}
@@ -3254,7 +3254,7 @@ save_PointParameterfvEXT(GLenum pname, const GLfloat *params)
n[4].f = params[2];
}
if (ctx->ExecuteFlag) {
- CALL_PointParameterfvEXT(ctx->Exec, (pname, params));
+ CALL_PointParameterfv(ctx->Exec, (pname, params));
}
}
@@ -4538,7 +4538,7 @@ save_ActiveTextureARB(GLenum target)
n[1].e = target;
}
if (ctx->ExecuteFlag) {
- CALL_ActiveTextureARB(ctx->Exec, (target));
+ CALL_ActiveTexture(ctx->Exec, (target));
}
}
@@ -4609,7 +4609,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_1D) {
/* don't compile, execute immediately */
- CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat,
+ CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat,
width, border, imageSize,
data));
}
@@ -4628,7 +4628,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
n[7].data = copy_data(data, imageSize, "glCompressedTexImage1DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexImage1DARB(ctx->Exec,
+ CALL_CompressedTexImage1D(ctx->Exec,
(target, level, internalFormat, width,
border, imageSize, data));
}
@@ -4645,7 +4645,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_2D) {
/* don't compile, execute immediately */
- CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat,
+ CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat,
width, height, border,
imageSize, data));
}
@@ -4665,7 +4665,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
n[8].data = copy_data(data, imageSize, "glCompressedTexImage2DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexImage2DARB(ctx->Exec,
+ CALL_CompressedTexImage2D(ctx->Exec,
(target, level, internalFormat, width,
height, border, imageSize, data));
}
@@ -4682,7 +4682,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
GET_CURRENT_CONTEXT(ctx);
if (target == GL_PROXY_TEXTURE_3D) {
/* don't compile, execute immediately */
- CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat,
+ CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat,
width, height, depth, border,
imageSize, data));
}
@@ -4703,7 +4703,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
n[9].data = copy_data(data, imageSize, "glCompressedTexImage3DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexImage3DARB(ctx->Exec,
+ CALL_CompressedTexImage3D(ctx->Exec,
(target, level, internalFormat, width,
height, depth, border, imageSize,
data));
@@ -4732,7 +4732,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
n[7].data = copy_data(data, imageSize, "glCompressedTexSubImage1DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset,
+ CALL_CompressedTexSubImage1D(ctx->Exec, (target, level, xoffset,
width, format, imageSize,
data));
}
@@ -4762,7 +4762,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
n[9].data = copy_data(data, imageSize, "glCompressedTexSubImage2DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexSubImage2DARB(ctx->Exec,
+ CALL_CompressedTexSubImage2D(ctx->Exec,
(target, level, xoffset, yoffset, width,
height, format, imageSize, data));
}
@@ -4794,7 +4794,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
n[11].data = copy_data(data, imageSize, "glCompressedTexSubImage3DARB");
}
if (ctx->ExecuteFlag) {
- CALL_CompressedTexSubImage3DARB(ctx->Exec,
+ CALL_CompressedTexSubImage3D(ctx->Exec,
(target, level, xoffset, yoffset,
zoffset, width, height, depth, format,
imageSize, data));
@@ -4815,7 +4815,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert)
n[2].b = invert;
}
if (ctx->ExecuteFlag) {
- CALL_SampleCoverageARB(ctx->Exec, (value, invert));
+ CALL_SampleCoverage(ctx->Exec, (value, invert));
}
}
@@ -4835,7 +4835,7 @@ save_BindProgramNV(GLenum target, GLuint id)
n[2].ui = id;
}
if (ctx->ExecuteFlag) {
- CALL_BindProgramNV(ctx->Exec, (target, id));
+ CALL_BindProgramARB(ctx->Exec, (target, id));
}
}
@@ -5120,7 +5120,7 @@ save_BeginQueryARB(GLenum target, GLuint id)
n[2].ui = id;
}
if (ctx->ExecuteFlag) {
- CALL_BeginQueryARB(ctx->Exec, (target, id));
+ CALL_BeginQuery(ctx->Exec, (target, id));
}
}
@@ -5135,7 +5135,7 @@ save_EndQueryARB(GLenum target)
n[1].e = target;
}
if (ctx->ExecuteFlag) {
- CALL_EndQueryARB(ctx->Exec, (target));
+ CALL_EndQuery(ctx->Exec, (target));
}
}
@@ -5206,7 +5206,7 @@ save_DrawBuffersARB(GLsizei count, const GLenum * buffers)
}
}
if (ctx->ExecuteFlag) {
- CALL_DrawBuffersARB(ctx->Exec, (count, buffers));
+ CALL_DrawBuffers(ctx->Exec, (count, buffers));
}
}
@@ -6022,7 +6022,7 @@ exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_BindAttribLocationARB(ctx->Exec, (program, index, name));
+ CALL_BindAttribLocation(ctx->Exec, (program, index, name));
}
static GLint GLAPIENTRY
@@ -6030,7 +6030,7 @@ exec_GetAttribLocationARB(GLuint program, const GLchar *name)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- return CALL_GetAttribLocationARB(ctx->Exec, (program, name));
+ return CALL_GetAttribLocation(ctx->Exec, (program, name));
}
static GLint GLAPIENTRY
@@ -6038,7 +6038,7 @@ exec_GetUniformLocationARB(GLuint program, const GLchar *name)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- return CALL_GetUniformLocationARB(ctx->Exec, (program, name));
+ return CALL_GetUniformLocation(ctx->Exec, (program, name));
}
/* XXX more shader functions needed here */
@@ -6065,7 +6065,7 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
n[10].e = filter;
}
if (ctx->ExecuteFlag) {
- CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,
+ CALL_BlitFramebuffer(ctx->Exec, (srcX0, srcY0, srcX1, srcY1,
dstX0, dstY0, dstX1, dstY1,
mask, filter));
}
@@ -6084,8 +6084,8 @@ save_ProvokingVertexEXT(GLenum mode)
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/
- _mesa_ProvokingVertexEXT(mode);
+ /*CALL_ProvokingVertex(ctx->Exec, (mode));*/
+ _mesa_ProvokingVertex(mode);
}
}
@@ -6102,7 +6102,7 @@ save_BeginTransformFeedback(GLenum mode)
n[1].e = mode;
}
if (ctx->ExecuteFlag) {
- CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode));
+ CALL_BeginTransformFeedback(ctx->Exec, (mode));
}
}
@@ -6115,7 +6115,7 @@ save_EndTransformFeedback(void)
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
(void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0);
if (ctx->ExecuteFlag) {
- CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+ CALL_EndTransformFeedback(ctx->Exec, ());
}
}
@@ -6240,7 +6240,7 @@ save_UseProgramObjectARB(GLhandleARB program)
n[1].ui = program;
}
if (ctx->ExecuteFlag) {
- CALL_UseProgramObjectARB(ctx->Exec, (program));
+ CALL_UseProgram(ctx->Exec, (program));
}
}
@@ -6257,7 +6257,7 @@ save_Uniform1fARB(GLint location, GLfloat x)
n[2].f = x;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform1fARB(ctx->Exec, (location, x));
+ CALL_Uniform1f(ctx->Exec, (location, x));
}
}
@@ -6275,7 +6275,7 @@ save_Uniform2fARB(GLint location, GLfloat x, GLfloat y)
n[3].f = y;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform2fARB(ctx->Exec, (location, x, y));
+ CALL_Uniform2f(ctx->Exec, (location, x, y));
}
}
@@ -6294,7 +6294,7 @@ save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z)
n[4].f = z;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform3fARB(ctx->Exec, (location, x, y, z));
+ CALL_Uniform3f(ctx->Exec, (location, x, y, z));
}
}
@@ -6314,7 +6314,7 @@ save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
n[5].f = w;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w));
+ CALL_Uniform4f(ctx->Exec, (location, x, y, z, w));
}
}
@@ -6343,7 +6343,7 @@ save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v)
n[3].data = memdup(v, count * 1 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform1fvARB(ctx->Exec, (location, count, v));
+ CALL_Uniform1fv(ctx->Exec, (location, count, v));
}
}
@@ -6360,7 +6360,7 @@ save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v)
n[3].data = memdup(v, count * 2 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform2fvARB(ctx->Exec, (location, count, v));
+ CALL_Uniform2fv(ctx->Exec, (location, count, v));
}
}
@@ -6377,7 +6377,7 @@ save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v)
n[3].data = memdup(v, count * 3 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform3fvARB(ctx->Exec, (location, count, v));
+ CALL_Uniform3fv(ctx->Exec, (location, count, v));
}
}
@@ -6394,7 +6394,7 @@ save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v)
n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform4fvARB(ctx->Exec, (location, count, v));
+ CALL_Uniform4fv(ctx->Exec, (location, count, v));
}
}
@@ -6411,7 +6411,7 @@ save_Uniform1iARB(GLint location, GLint x)
n[2].i = x;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform1iARB(ctx->Exec, (location, x));
+ CALL_Uniform1i(ctx->Exec, (location, x));
}
}
@@ -6428,7 +6428,7 @@ save_Uniform2iARB(GLint location, GLint x, GLint y)
n[3].i = y;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform2iARB(ctx->Exec, (location, x, y));
+ CALL_Uniform2i(ctx->Exec, (location, x, y));
}
}
@@ -6446,7 +6446,7 @@ save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z)
n[4].i = z;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform3iARB(ctx->Exec, (location, x, y, z));
+ CALL_Uniform3i(ctx->Exec, (location, x, y, z));
}
}
@@ -6465,7 +6465,7 @@ save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w)
n[5].i = w;
}
if (ctx->ExecuteFlag) {
- CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w));
+ CALL_Uniform4i(ctx->Exec, (location, x, y, z, w));
}
}
@@ -6484,7 +6484,7 @@ save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v)
n[3].data = memdup(v, count * 1 * sizeof(GLint));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform1ivARB(ctx->Exec, (location, count, v));
+ CALL_Uniform1iv(ctx->Exec, (location, count, v));
}
}
@@ -6501,7 +6501,7 @@ save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v)
n[3].data = memdup(v, count * 2 * sizeof(GLint));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform2ivARB(ctx->Exec, (location, count, v));
+ CALL_Uniform2iv(ctx->Exec, (location, count, v));
}
}
@@ -6518,7 +6518,7 @@ save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v)
n[3].data = memdup(v, count * 3 * sizeof(GLint));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform3ivARB(ctx->Exec, (location, count, v));
+ CALL_Uniform3iv(ctx->Exec, (location, count, v));
}
}
@@ -6535,7 +6535,7 @@ save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v)
n[3].data = memdup(v, count * 4 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_Uniform4ivARB(ctx->Exec, (location, count, v));
+ CALL_Uniform4iv(ctx->Exec, (location, count, v));
}
}
@@ -6698,7 +6698,7 @@ save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m));
+ CALL_UniformMatrix2fv(ctx->Exec, (location, count, transpose, m));
}
}
@@ -6717,7 +6717,7 @@ save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m));
+ CALL_UniformMatrix3fv(ctx->Exec, (location, count, transpose, m));
}
}
@@ -6736,7 +6736,7 @@ save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat));
}
if (ctx->ExecuteFlag) {
- CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m));
+ CALL_UniformMatrix4fv(ctx->Exec, (location, count, transpose, m));
}
}
@@ -6869,7 +6869,7 @@ save_ClampColorARB(GLenum target, GLenum clamp)
n[2].e = clamp;
}
if (ctx->ExecuteFlag) {
- CALL_ClampColorARB(ctx->Exec, (target, clamp));
+ CALL_ClampColor(ctx->Exec, (target, clamp));
}
}
@@ -6959,7 +6959,7 @@ save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params)
n[6].i = params[3];
}
if (ctx->ExecuteFlag) {
- CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params));
+ CALL_TexParameterIiv(ctx->Exec, (target, pname, params));
}
}
@@ -6980,7 +6980,7 @@ save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
n[6].ui = params[3];
}
if (ctx->ExecuteFlag) {
- CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params));
+ CALL_TexParameterIuiv(ctx->Exec, (target, pname, params));
}
}
@@ -6990,7 +6990,7 @@ exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params));
+ CALL_GetTexParameterIiv(ctx->Exec, (target, pname, params));
}
/** GL_EXT_texture_integer */
@@ -6999,7 +6999,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));
+ CALL_GetTexParameterIuiv(ctx->Exec, (target, pname, params));
}
@@ -7016,7 +7016,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor)
n[2].ui = divisor;
}
if (ctx->ExecuteFlag) {
- CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor));
+ CALL_VertexAttribDivisor(ctx->Exec, (index, divisor));
}
}
@@ -7257,7 +7257,7 @@ save_BeginConditionalRender(GLuint queryId, GLenum mode)
n[2].e = mode;
}
if (ctx->ExecuteFlag) {
- CALL_BeginConditionalRenderNV(ctx->Exec, (queryId, mode));
+ CALL_BeginConditionalRender(ctx->Exec, (queryId, mode));
}
}
@@ -7268,7 +7268,7 @@ save_EndConditionalRender(void)
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
alloc_instruction(ctx, OPCODE_END_CONDITIONAL_RENDER, 0);
if (ctx->ExecuteFlag) {
- CALL_EndConditionalRenderNV(ctx->Exec, ());
+ CALL_EndConditionalRender(ctx->Exec, ());
}
}
@@ -7412,10 +7412,10 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_BlendEquation(ctx->Exec, (n[1].e));
break;
case OPCODE_BLEND_EQUATION_SEPARATE:
- CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e));
+ CALL_BlendEquationSeparate(ctx->Exec, (n[1].e, n[2].e));
break;
case OPCODE_BLEND_FUNC_SEPARATE:
- CALL_BlendFuncSeparateEXT(ctx->Exec,
+ CALL_BlendFuncSeparate(ctx->Exec,
(n[1].e, n[2].e, n[3].e, n[4].e));
break;
@@ -7520,7 +7520,7 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b));
break;
case OPCODE_COLOR_MASK_INDEXED:
- CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b,
+ CALL_ColorMaski(ctx->Exec, (n[1].ui, n[2].b, n[3].b,
n[4].b, n[5].b));
break;
case OPCODE_COLOR_MATERIAL:
@@ -7666,7 +7666,7 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_Disable(ctx->Exec, (n[1].e));
break;
case OPCODE_DISABLE_INDEXED:
- CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
+ CALL_Disablei(ctx->Exec, (n[1].ui, n[2].e));
break;
case OPCODE_DRAW_BUFFER:
CALL_DrawBuffer(ctx->Exec, (n[1].e));
@@ -7684,7 +7684,7 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_Enable(ctx->Exec, (n[1].e));
break;
case OPCODE_ENABLE_INDEXED:
- CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e));
+ CALL_Enablei(ctx->Exec, (n[1].ui, n[2].e));
break;
case OPCODE_EVALMESH1:
CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i));
@@ -7852,7 +7852,7 @@ execute_list(struct gl_context *ctx, GLuint list)
params[0] = n[2].f;
params[1] = n[3].f;
params[2] = n[4].f;
- CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params));
+ CALL_PointParameterfv(ctx->Exec, (n[1].e, params));
}
break;
case OPCODE_POLYGON_MODE:
@@ -7915,7 +7915,7 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_ShadeModel(ctx->Exec, (n[1].e));
break;
case OPCODE_PROVOKING_VERTEX:
- CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e));
+ CALL_ProvokingVertex(ctx->Exec, (n[1].e));
break;
case OPCODE_STENCIL_FUNC:
CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui));
@@ -8058,49 +8058,49 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
break;
case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */
- CALL_ActiveTextureARB(ctx->Exec, (n[1].e));
+ CALL_ActiveTexture(ctx->Exec, (n[1].e));
break;
case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */
- CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+ CALL_CompressedTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
n[4].i, n[5].i, n[6].i,
n[7].data));
break;
case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */
- CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+ CALL_CompressedTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
n[4].i, n[5].i, n[6].i,
n[7].i, n[8].data));
break;
case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */
- CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e,
+ CALL_CompressedTexImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].e,
n[4].i, n[5].i, n[6].i,
n[7].i, n[8].i,
n[9].data));
break;
case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */
- CALL_CompressedTexSubImage1DARB(ctx->Exec,
+ CALL_CompressedTexSubImage1D(ctx->Exec,
(n[1].e, n[2].i, n[3].i, n[4].i,
n[5].e, n[6].i, n[7].data));
break;
case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */
- CALL_CompressedTexSubImage2DARB(ctx->Exec,
+ CALL_CompressedTexSubImage2D(ctx->Exec,
(n[1].e, n[2].i, n[3].i, n[4].i,
n[5].i, n[6].i, n[7].e, n[8].i,
n[9].data));
break;
case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */
- CALL_CompressedTexSubImage3DARB(ctx->Exec,
+ CALL_CompressedTexSubImage3D(ctx->Exec,
(n[1].e, n[2].i, n[3].i, n[4].i,
n[5].i, n[6].i, n[7].i, n[8].i,
n[9].e, n[10].i, n[11].data));
break;
case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */
- CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b));
+ CALL_SampleCoverage(ctx->Exec, (n[1].f, n[2].b));
break;
case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */
- CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f));
+ CALL_WindowPos3f(ctx->Exec, (n[1].f, n[2].f, n[3].f));
break;
case OPCODE_BIND_PROGRAM_NV: /* GL_ARB_vertex_program */
- CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui));
+ CALL_BindProgramARB(ctx->Exec, (n[1].e, n[2].ui));
break;
case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB:
CALL_ProgramLocalParameter4fARB(ctx->Exec,
@@ -8123,10 +8123,10 @@ execute_list(struct gl_context *ctx, GLuint list)
n[6].f));
break;
case OPCODE_BEGIN_QUERY_ARB:
- CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
+ CALL_BeginQuery(ctx->Exec, (n[1].e, n[2].ui));
break;
case OPCODE_END_QUERY_ARB:
- CALL_EndQueryARB(ctx->Exec, (n[1].e));
+ CALL_EndQuery(ctx->Exec, (n[1].e));
break;
case OPCODE_QUERY_COUNTER:
CALL_QueryCounter(ctx->Exec, (n[1].ui, n[2].e));
@@ -8143,16 +8143,16 @@ execute_list(struct gl_context *ctx, GLuint list)
GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS);
for (i = 0; i < count; i++)
buffers[i] = n[2 + i].e;
- CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers));
+ CALL_DrawBuffers(ctx->Exec, (n[1].i, buffers));
}
break;
case OPCODE_BLIT_FRAMEBUFFER:
- CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
+ CALL_BlitFramebuffer(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i,
n[5].i, n[6].i, n[7].i, n[8].i,
n[9].i, n[10].e));
break;
case OPCODE_USE_PROGRAM:
- CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui));
+ CALL_UseProgram(ctx->Exec, (n[1].ui));
break;
case OPCODE_USE_SHADER_PROGRAM_EXT:
CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui));
@@ -8161,54 +8161,54 @@ execute_list(struct gl_context *ctx, GLuint list)
CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui));
break;
case OPCODE_UNIFORM_1F:
- CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f));
+ CALL_Uniform1f(ctx->Exec, (n[1].i, n[2].f));
break;
case OPCODE_UNIFORM_2F:
- CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f));
+ CALL_Uniform2f(ctx->Exec, (n[1].i, n[2].f, n[3].f));
break;
case OPCODE_UNIFORM_3F:
- CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));
+ CALL_Uniform3f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f));
break;
case OPCODE_UNIFORM_4F:
- CALL_Uniform4fARB(ctx->Exec,
+ CALL_Uniform4f(ctx->Exec,
(n[1].i, n[2].f, n[3].f, n[4].f, n[5].f));
break;
case OPCODE_UNIFORM_1FV:
- CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform1fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_2FV:
- CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform2fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_3FV:
- CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform3fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_4FV:
- CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform4fv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_1I:
- CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i));
+ CALL_Uniform1i(ctx->Exec, (n[1].i, n[2].i));
break;
case OPCODE_UNIFORM_2I:
- CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i));
+ CALL_Uniform2i(ctx->Exec, (n[1].i, n[2].i, n[3].i));
break;
case OPCODE_UNIFORM_3I:
- CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
+ CALL_Uniform3i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i));
break;
case OPCODE_UNIFORM_4I:
- CALL_Uniform4iARB(ctx->Exec,
+ CALL_Uniform4i(ctx->Exec,
(n[1].i, n[2].i, n[3].i, n[4].i, n[5].i));
break;
case OPCODE_UNIFORM_1IV:
- CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform1iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_2IV:
- CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform2iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_3IV:
- CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform3iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_4IV:
- CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));
+ CALL_Uniform4iv(ctx->Exec, (n[1].i, n[2].i, n[3].data));
break;
case OPCODE_UNIFORM_1UI:
/*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/
@@ -8237,15 +8237,15 @@ execute_list(struct gl_context *ctx, GLuint list)
/*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/
break;
case OPCODE_UNIFORM_MATRIX22:
- CALL_UniformMatrix2fvARB(ctx->Exec,
+ CALL_UniformMatrix2fv(ctx->Exec,
(n[1].i, n[2].i, n[3].b, n[4].data));
break;
case OPCODE_UNIFORM_MATRIX33:
- CALL_UniformMatrix3fvARB(ctx->Exec,
+ CALL_UniformMatrix3fv(ctx->Exec,
(n[1].i, n[2].i, n[3].b, n[4].data));
break;
case OPCODE_UNIFORM_MATRIX44:
- CALL_UniformMatrix4fvARB(ctx->Exec,
+ CALL_UniformMatrix4fv(ctx->Exec,
(n[1].i, n[2].i, n[3].b, n[4].data));
break;
case OPCODE_UNIFORM_MATRIX23:
@@ -8274,7 +8274,7 @@ execute_list(struct gl_context *ctx, GLuint list)
break;
case OPCODE_CLAMP_COLOR:
- CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e));
+ CALL_ClampColor(ctx->Exec, (n[1].e, n[2].e));
break;
case OPCODE_TEX_BUMP_PARAMETER_ATI:
@@ -8407,7 +8407,7 @@ execute_list(struct gl_context *ctx, GLuint list)
params[1] = n[4].i;
params[2] = n[5].i;
params[3] = n[6].i;
- CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params));
+ CALL_TexParameterIiv(ctx->Exec, (n[1].e, n[2].e, params));
}
break;
case OPCODE_TEXPARAMETER_UI:
@@ -8417,13 +8417,13 @@ execute_list(struct gl_context *ctx, GLuint list)
params[1] = n[4].ui;
params[2] = n[5].ui;
params[3] = n[6].ui;
- CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params));
+ CALL_TexParameterIuiv(ctx->Exec, (n[1].e, n[2].e, params));
}
break;
case OPCODE_VERTEX_ATTRIB_DIVISOR:
/* GL_ARB_instanced_arrays */
- CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui));
+ CALL_VertexAttribDivisor(ctx->Exec, (n[1].ui, n[2].ui));
break;
case OPCODE_TEXTURE_BARRIER_NV:
@@ -8432,10 +8432,10 @@ execute_list(struct gl_context *ctx, GLuint list)
/* GL_EXT/ARB_transform_feedback */
case OPCODE_BEGIN_TRANSFORM_FEEDBACK:
- CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e));
+ CALL_BeginTransformFeedback(ctx->Exec, (n[1].e));
break;
case OPCODE_END_TRANSFORM_FEEDBACK:
- CALL_EndTransformFeedbackEXT(ctx->Exec, ());
+ CALL_EndTransformFeedback(ctx->Exec, ());
break;
case OPCODE_BIND_TRANSFORM_FEEDBACK:
CALL_BindTransformFeedback(ctx->Exec, (n[1].e, n[2].ui));
@@ -8532,10 +8532,10 @@ execute_list(struct gl_context *ctx, GLuint list)
/* GL_NV_conditional_render */
case OPCODE_BEGIN_CONDITIONAL_RENDER:
- CALL_BeginConditionalRenderNV(ctx->Exec, (n[1].i, n[2].e));
+ CALL_BeginConditionalRender(ctx->Exec, (n[1].i, n[2].e));
break;
case OPCODE_END_CONDITIONAL_RENDER:
- CALL_EndConditionalRenderNV(ctx->Exec, ());
+ CALL_EndConditionalRender(ctx->Exec, ());
break;
case OPCODE_UNIFORM_BLOCK_BINDING:
@@ -9280,7 +9280,7 @@ exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img));
+ CALL_GetCompressedTexImage(ctx->Exec, (target, level, img));
}
static void GLAPIENTRY
@@ -9508,7 +9508,7 @@ exec_ClientActiveTextureARB(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_ClientActiveTextureARB(ctx->Exec, (target));
+ CALL_ClientActiveTexture(ctx->Exec, (target));
}
static void GLAPIENTRY
@@ -9517,7 +9517,7 @@ exec_SecondaryColorPointerEXT(GLint size, GLenum type,
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr));
+ CALL_SecondaryColorPointer(ctx->Exec, (size, type, stride, ptr));
}
static void GLAPIENTRY
@@ -9525,7 +9525,7 @@ exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr));
+ CALL_FogCoordPointer(ctx->Exec, (type, stride, ptr));
}
/* GL_EXT_multi_draw_arrays */
@@ -9535,7 +9535,7 @@ exec_MultiDrawArraysEXT(GLenum mode, const GLint *first,
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
- CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));
+ CALL_MultiDrawArrays(ctx->Exec, (mode, first, count, primcount));
}
/* GL_IBM_multimode_draw_arrays */
@@ -9599,7 +9599,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_ClearStencil(table, save_ClearStencil);
SET_ClipPlane(table, save_ClipPlane);
SET_ColorMask(table, save_ColorMask);
- SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed);
+ SET_ColorMaski(table, save_ColorMaskIndexed);
SET_ColorMaterial(table, save_ColorMaterial);
SET_CopyPixels(table, save_CopyPixels);
SET_CullFace(table, save_CullFace);
@@ -9608,11 +9608,11 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_DepthMask(table, save_DepthMask);
SET_DepthRange(table, save_DepthRange);
SET_Disable(table, save_Disable);
- SET_DisableIndexedEXT(table, save_DisableIndexed);
+ SET_Disablei(table, save_DisableIndexed);
SET_DrawBuffer(table, save_DrawBuffer);
SET_DrawPixels(table, save_DrawPixels);
SET_Enable(table, save_Enable);
- SET_EnableIndexedEXT(table, save_EnableIndexed);
+ SET_Enablei(table, save_EnableIndexed);
SET_EndList(table, _mesa_EndList);
SET_EvalMesh1(table, save_EvalMesh1);
SET_EvalMesh2(table, save_EvalMesh2);
@@ -9878,45 +9878,45 @@ _mesa_create_save_table(const struct gl_context *ctx)
#endif
/* 54. GL_EXT_point_parameters */
- SET_PointParameterfEXT(table, save_PointParameterfEXT);
- SET_PointParameterfvEXT(table, save_PointParameterfvEXT);
+ SET_PointParameterf(table, save_PointParameterfEXT);
+ SET_PointParameterfv(table, save_PointParameterfvEXT);
/* 97. GL_EXT_compiled_vertex_array */
SET_LockArraysEXT(table, exec_LockArraysEXT);
SET_UnlockArraysEXT(table, exec_UnlockArraysEXT);
/* 145. GL_EXT_secondary_color */
- SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT);
+ SET_SecondaryColorPointer(table, exec_SecondaryColorPointerEXT);
/* 148. GL_EXT_multi_draw_arrays */
- SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);
+ SET_MultiDrawArrays(table, exec_MultiDrawArraysEXT);
/* 149. GL_EXT_fog_coord */
- SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);
+ SET_FogCoordPointer(table, exec_FogCoordPointerEXT);
/* 173. GL_EXT_blend_func_separate */
- SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT);
+ SET_BlendFuncSeparate(table, save_BlendFuncSeparateEXT);
/* 196. GL_MESA_resize_buffers */
SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA);
/* 197. GL_MESA_window_pos */
- SET_WindowPos2dMESA(table, save_WindowPos2dMESA);
- SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA);
- SET_WindowPos2fMESA(table, save_WindowPos2fMESA);
- SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA);
- SET_WindowPos2iMESA(table, save_WindowPos2iMESA);
- SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA);
- SET_WindowPos2sMESA(table, save_WindowPos2sMESA);
- SET_WindowPos2svMESA(table, save_WindowPos2svMESA);
- SET_WindowPos3dMESA(table, save_WindowPos3dMESA);
- SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA);
- SET_WindowPos3fMESA(table, save_WindowPos3fMESA);
- SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA);
- SET_WindowPos3iMESA(table, save_WindowPos3iMESA);
- SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA);
- SET_WindowPos3sMESA(table, save_WindowPos3sMESA);
- SET_WindowPos3svMESA(table, save_WindowPos3svMESA);
+ SET_WindowPos2d(table, save_WindowPos2dMESA);
+ SET_WindowPos2dv(table, save_WindowPos2dvMESA);
+ SET_WindowPos2f(table, save_WindowPos2fMESA);
+ SET_WindowPos2fv(table, save_WindowPos2fvMESA);
+ SET_WindowPos2i(table, save_WindowPos2iMESA);
+ SET_WindowPos2iv(table, save_WindowPos2ivMESA);
+ SET_WindowPos2s(table, save_WindowPos2sMESA);
+ SET_WindowPos2sv(table, save_WindowPos2svMESA);
+ SET_WindowPos3d(table, save_WindowPos3dMESA);
+ SET_WindowPos3dv(table, save_WindowPos3dvMESA);
+ SET_WindowPos3f(table, save_WindowPos3fMESA);
+ SET_WindowPos3fv(table, save_WindowPos3fvMESA);
+ SET_WindowPos3i(table, save_WindowPos3iMESA);
+ SET_WindowPos3iv(table, save_WindowPos3ivMESA);
+ SET_WindowPos3s(table, save_WindowPos3sMESA);
+ SET_WindowPos3sv(table, save_WindowPos3svMESA);
SET_WindowPos4dMESA(table, save_WindowPos4dMESA);
SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA);
SET_WindowPos4fMESA(table, save_WindowPos4fMESA);
@@ -9935,10 +9935,10 @@ _mesa_create_save_table(const struct gl_context *ctx)
* AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,
* VertexAttribPointerNV, GetProgram*, GetVertexAttrib*
*/
- SET_BindProgramNV(table, save_BindProgramNV);
- SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
- SET_GenProgramsNV(table, _mesa_GenPrograms);
- SET_IsProgramNV(table, _mesa_IsProgramARB);
+ SET_BindProgramARB(table, save_BindProgramNV);
+ SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB);
+ SET_GenProgramsARB(table, _mesa_GenProgramsARB);
+ SET_IsProgramARB(table, _mesa_IsProgramARB);
/* 244. GL_ATI_envmap_bumpmap */
SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI);
@@ -9949,32 +9949,32 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI);
/* 262. GL_NV_point_sprite */
- SET_PointParameteriNV(table, save_PointParameteriNV);
- SET_PointParameterivNV(table, save_PointParameterivNV);
+ SET_PointParameteri(table, save_PointParameteriNV);
+ SET_PointParameteriv(table, save_PointParameterivNV);
/* 268. GL_EXT_stencil_two_side */
SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT);
/* 273. GL_APPLE_vertex_array_object */
SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE);
- SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE);
+ SET_DeleteVertexArrays(table, _mesa_DeleteVertexArrays);
SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE);
- SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE);
+ SET_IsVertexArray(table, _mesa_IsVertexArray);
/* 310. GL_EXT_framebuffer_object */
- SET_GenFramebuffersEXT(table, _mesa_GenFramebuffersEXT);
- SET_BindFramebufferEXT(table, _mesa_BindFramebufferEXT);
- SET_DeleteFramebuffersEXT(table, _mesa_DeleteFramebuffersEXT);
- SET_CheckFramebufferStatusEXT(table, _mesa_CheckFramebufferStatusEXT);
- SET_GenRenderbuffersEXT(table, _mesa_GenRenderbuffersEXT);
- SET_BindRenderbufferEXT(table, _mesa_BindRenderbufferEXT);
- SET_DeleteRenderbuffersEXT(table, _mesa_DeleteRenderbuffersEXT);
- SET_RenderbufferStorageEXT(table, _mesa_RenderbufferStorageEXT);
- SET_FramebufferTexture1DEXT(table, _mesa_FramebufferTexture1DEXT);
- SET_FramebufferTexture2DEXT(table, _mesa_FramebufferTexture2DEXT);
- SET_FramebufferTexture3DEXT(table, _mesa_FramebufferTexture3DEXT);
- SET_FramebufferRenderbufferEXT(table, _mesa_FramebufferRenderbufferEXT);
- SET_GenerateMipmapEXT(table, _mesa_GenerateMipmapEXT);
+ SET_GenFramebuffers(table, _mesa_GenFramebuffers);
+ SET_BindFramebuffer(table, _mesa_BindFramebuffer);
+ SET_DeleteFramebuffers(table, _mesa_DeleteFramebuffers);
+ SET_CheckFramebufferStatus(table, _mesa_CheckFramebufferStatus);
+ SET_GenRenderbuffers(table, _mesa_GenRenderbuffers);
+ SET_BindRenderbuffer(table, _mesa_BindRenderbuffer);
+ SET_DeleteRenderbuffers(table, _mesa_DeleteRenderbuffers);
+ SET_RenderbufferStorage(table, _mesa_RenderbufferStorage);
+ SET_FramebufferTexture1D(table, _mesa_FramebufferTexture1D);
+ SET_FramebufferTexture2D(table, _mesa_FramebufferTexture2D);
+ SET_FramebufferTexture3D(table, _mesa_FramebufferTexture3D);
+ SET_FramebufferRenderbuffer(table, _mesa_FramebufferRenderbuffer);
+ SET_GenerateMipmap(table, _mesa_GenerateMipmap);
/* 317. GL_EXT_framebuffer_multisample */
SET_RenderbufferStorageMultisample(table, _mesa_RenderbufferStorageMultisample);
@@ -9987,26 +9987,26 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_DepthBoundsEXT(table, save_DepthBoundsEXT);
/* ARB 1. GL_ARB_multitexture */
- SET_ActiveTextureARB(table, save_ActiveTextureARB);
- SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB);
+ SET_ActiveTexture(table, save_ActiveTextureARB);
+ SET_ClientActiveTexture(table, exec_ClientActiveTextureARB);
/* ARB 3. GL_ARB_transpose_matrix */
- SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB);
- SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB);
- SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB);
- SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB);
+ SET_LoadTransposeMatrixd(table, save_LoadTransposeMatrixdARB);
+ SET_LoadTransposeMatrixf(table, save_LoadTransposeMatrixfARB);
+ SET_MultTransposeMatrixd(table, save_MultTransposeMatrixdARB);
+ SET_MultTransposeMatrixf(table, save_MultTransposeMatrixfARB);
/* ARB 5. GL_ARB_multisample */
- SET_SampleCoverageARB(table, save_SampleCoverageARB);
+ SET_SampleCoverage(table, save_SampleCoverageARB);
/* ARB 12. GL_ARB_texture_compression */
- SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB);
- SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB);
- SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB);
- SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB);
- SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB);
- SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB);
- SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB);
+ SET_CompressedTexImage3D(table, save_CompressedTexImage3DARB);
+ SET_CompressedTexImage2D(table, save_CompressedTexImage2DARB);
+ SET_CompressedTexImage1D(table, save_CompressedTexImage1DARB);
+ SET_CompressedTexSubImage3D(table, save_CompressedTexSubImage3DARB);
+ SET_CompressedTexSubImage2D(table, save_CompressedTexSubImage2DARB);
+ SET_CompressedTexSubImage1D(table, save_CompressedTexSubImage1DARB);
+ SET_GetCompressedTexImage(table, exec_GetCompressedTexImageARB);
/* ARB 14. GL_ARB_point_parameters */
/* aliased with EXT_point_parameters functions */
@@ -10017,18 +10017,18 @@ _mesa_create_save_table(const struct gl_context *ctx)
/* ARB 26. GL_ARB_vertex_program */
/* ARB 27. GL_ARB_fragment_program */
/* glVertexAttrib* functions alias the NV ones, handled elsewhere */
- SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB);
- SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB);
- SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB);
+ SET_VertexAttribPointer(table, _mesa_VertexAttribPointer);
+ SET_EnableVertexAttribArray(table, _mesa_EnableVertexAttribArray);
+ SET_DisableVertexAttribArray(table, _mesa_DisableVertexAttribArray);
SET_ProgramStringARB(table, save_ProgramStringARB);
- SET_BindProgramNV(table, save_BindProgramNV);
- SET_DeleteProgramsNV(table, _mesa_DeletePrograms);
- SET_GenProgramsNV(table, _mesa_GenPrograms);
- SET_IsProgramNV(table, _mesa_IsProgramARB);
- SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB);
- SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB);
- SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB);
- SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervARB);
+ SET_BindProgramARB(table, save_BindProgramNV);
+ SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB);
+ SET_GenProgramsARB(table, _mesa_GenProgramsARB);
+ SET_IsProgramARB(table, _mesa_IsProgramARB);
+ SET_GetVertexAttribdv(table, _mesa_GetVertexAttribdv);
+ SET_GetVertexAttribfv(table, _mesa_GetVertexAttribfv);
+ SET_GetVertexAttribiv(table, _mesa_GetVertexAttribiv);
+ SET_GetVertexAttribPointerv(table, _mesa_GetVertexAttribPointerv);
SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);
@@ -10048,49 +10048,49 @@ _mesa_create_save_table(const struct gl_context *ctx)
/* ARB 28. GL_ARB_vertex_buffer_object */
/* None of the extension's functions get compiled */
- SET_BindBufferARB(table, _mesa_BindBufferARB);
- SET_BufferDataARB(table, _mesa_BufferDataARB);
- SET_BufferSubDataARB(table, _mesa_BufferSubDataARB);
- SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB);
- SET_GenBuffersARB(table, _mesa_GenBuffersARB);
- SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB);
- SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB);
- SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB);
- SET_IsBufferARB(table, _mesa_IsBufferARB);
- SET_MapBufferARB(table, _mesa_MapBufferARB);
- SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
+ SET_BindBuffer(table, _mesa_BindBuffer);
+ SET_BufferData(table, _mesa_BufferData);
+ SET_BufferSubData(table, _mesa_BufferSubData);
+ SET_DeleteBuffers(table, _mesa_DeleteBuffers);
+ SET_GenBuffers(table, _mesa_GenBuffers);
+ SET_GetBufferParameteriv(table, _mesa_GetBufferParameteriv);
+ SET_GetBufferPointerv(table, _mesa_GetBufferPointerv);
+ SET_GetBufferSubData(table, _mesa_GetBufferSubData);
+ SET_IsBuffer(table, _mesa_IsBuffer);
+ SET_MapBuffer(table, _mesa_MapBuffer);
+ SET_UnmapBuffer(table, _mesa_UnmapBuffer);
_mesa_init_queryobj_dispatch(ctx, table); /* glGetQuery, etc */
- SET_BeginQueryARB(table, save_BeginQueryARB);
- SET_EndQueryARB(table, save_EndQueryARB);
+ SET_BeginQuery(table, save_BeginQueryARB);
+ SET_EndQuery(table, save_EndQueryARB);
SET_QueryCounter(table, save_QueryCounter);
- SET_DrawBuffersARB(table, save_DrawBuffersARB);
+ SET_DrawBuffers(table, save_DrawBuffersARB);
- SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT);
+ SET_BlitFramebuffer(table, save_BlitFramebufferEXT);
/* GL_ARB_shader_objects */
_mesa_init_shader_dispatch(ctx, table); /* Plug in glCreate/Delete/Get, etc */
- SET_UseProgramObjectARB(table, save_UseProgramObjectARB);
- SET_Uniform1fARB(table, save_Uniform1fARB);
- SET_Uniform2fARB(table, save_Uniform2fARB);
- SET_Uniform3fARB(table, save_Uniform3fARB);
- SET_Uniform4fARB(table, save_Uniform4fARB);
- SET_Uniform1fvARB(table, save_Uniform1fvARB);
- SET_Uniform2fvARB(table, save_Uniform2fvARB);
- SET_Uniform3fvARB(table, save_Uniform3fvARB);
- SET_Uniform4fvARB(table, save_Uniform4fvARB);
- SET_Uniform1iARB(table, save_Uniform1iARB);
- SET_Uniform2iARB(table, save_Uniform2iARB);
- SET_Uniform3iARB(table, save_Uniform3iARB);
- SET_Uniform4iARB(table, save_Uniform4iARB);
- SET_Uniform1ivARB(table, save_Uniform1ivARB);
- SET_Uniform2ivARB(table, save_Uniform2ivARB);
- SET_Uniform3ivARB(table, save_Uniform3ivARB);
- SET_Uniform4ivARB(table, save_Uniform4ivARB);
- SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB);
- SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB);
- SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB);
+ SET_UseProgram(table, save_UseProgramObjectARB);
+ SET_Uniform1f(table, save_Uniform1fARB);
+ SET_Uniform2f(table, save_Uniform2fARB);
+ SET_Uniform3f(table, save_Uniform3fARB);
+ SET_Uniform4f(table, save_Uniform4fARB);
+ SET_Uniform1fv(table, save_Uniform1fvARB);
+ SET_Uniform2fv(table, save_Uniform2fvARB);
+ SET_Uniform3fv(table, save_Uniform3fvARB);
+ SET_Uniform4fv(table, save_Uniform4fvARB);
+ SET_Uniform1i(table, save_Uniform1iARB);
+ SET_Uniform2i(table, save_Uniform2iARB);
+ SET_Uniform3i(table, save_Uniform3iARB);
+ SET_Uniform4i(table, save_Uniform4iARB);
+ SET_Uniform1iv(table, save_Uniform1ivARB);
+ SET_Uniform2iv(table, save_Uniform2ivARB);
+ SET_Uniform3iv(table, save_Uniform3ivARB);
+ SET_Uniform4iv(table, save_Uniform4ivARB);
+ SET_UniformMatrix2fv(table, save_UniformMatrix2fvARB);
+ SET_UniformMatrix3fv(table, save_UniformMatrix3fvARB);
+ SET_UniformMatrix4fv(table, save_UniformMatrix4fvARB);
SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv);
SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv);
SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv);
@@ -10099,13 +10099,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv);
/* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */
- SET_BindAttribLocationARB(table, exec_BindAttribLocationARB);
- SET_GetAttribLocationARB(table, exec_GetAttribLocationARB);
- SET_GetUniformLocationARB(table, exec_GetUniformLocationARB);
+ SET_BindAttribLocation(table, exec_BindAttribLocationARB);
+ SET_GetAttribLocation(table, exec_GetAttribLocationARB);
+ SET_GetUniformLocation(table, exec_GetUniformLocationARB);
/* XXX additional functions need to be implemented here! */
/* 299. GL_EXT_blend_equation_separate */
- SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT);
+ SET_BlendEquationSeparate(table, save_BlendEquationSeparateEXT);
/* GL_EXT_gpu_program_parameters */
SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT);
@@ -10116,13 +10116,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
/* ARB 51. GL_ARB_texture_buffer_object */
- SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */
+ SET_TexBuffer(table, _mesa_TexBuffer); /* no dlist save */
/* ARB 59. GL_ARB_copy_buffer */
SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
/* 364. GL_EXT_provoking_vertex */
- SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
+ SET_ProvokingVertex(table, save_ProvokingVertexEXT);
/* 371. GL_APPLE_object_purgeable */
SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);
@@ -10132,17 +10132,17 @@ _mesa_create_save_table(const struct gl_context *ctx)
/* GL_EXT_texture_integer */
SET_ClearColorIiEXT(table, save_ClearColorIi);
SET_ClearColorIuiEXT(table, save_ClearColorIui);
- SET_TexParameterIivEXT(table, save_TexParameterIiv);
- SET_TexParameterIuivEXT(table, save_TexParameterIuiv);
- SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv);
- SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv);
+ SET_TexParameterIiv(table, save_TexParameterIiv);
+ SET_TexParameterIuiv(table, save_TexParameterIuiv);
+ SET_GetTexParameterIiv(table, exec_GetTexParameterIiv);
+ SET_GetTexParameterIuiv(table, exec_GetTexParameterIuiv);
/* 377. GL_EXT_separate_shader_objects */
SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT);
SET_ActiveProgramEXT(table, save_ActiveProgramEXT);
/* GL_ARB_color_buffer_float */
- SET_ClampColorARB(table, save_ClampColorARB);
+ SET_ClampColor(table, save_ClampColorARB);
/* GL 3.0 */
SET_ClearBufferiv(table, save_ClearBufferiv);
@@ -10170,13 +10170,13 @@ _mesa_create_save_table(const struct gl_context *ctx)
#endif
/* These are not compiled into display lists: */
- SET_BindBufferBaseEXT(table, _mesa_BindBufferBase);
+ SET_BindBufferBase(table, _mesa_BindBufferBase);
SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT);
- SET_BindBufferRangeEXT(table, _mesa_BindBufferRange);
- SET_TransformFeedbackVaryingsEXT(table, _mesa_TransformFeedbackVaryings);
+ SET_BindBufferRange(table, _mesa_BindBufferRange);
+ SET_TransformFeedbackVaryings(table, _mesa_TransformFeedbackVaryings);
/* These are: */
- SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback);
- SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback);
+ SET_BeginTransformFeedback(table, save_BeginTransformFeedback);
+ SET_EndTransformFeedback(table, save_EndTransformFeedback);
SET_BindTransformFeedback(table, save_BindTransformFeedback);
SET_PauseTransformFeedback(table, save_PauseTransformFeedback);
SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback);
@@ -10190,7 +10190,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_EndQueryIndexed(table, save_EndQueryIndexed);
/* GL_ARB_instanced_arrays */
- SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor);
+ SET_VertexAttribDivisor(table, save_VertexAttribDivisor);
/* GL_NV_texture_barrier */
SET_TextureBarrierNV(table, save_TextureBarrierNV);
@@ -10217,8 +10217,8 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
/* GL_NV_conditional_render */
- SET_BeginConditionalRenderNV(table, save_BeginConditionalRender);
- SET_EndConditionalRenderNV(table, save_EndConditionalRender);
+ SET_BeginConditionalRender(table, save_BeginConditionalRender);
+ SET_EndConditionalRender(table, save_EndConditionalRender);
/* GL_ARB_sync */
_mesa_init_sync_dispatch(table);
@@ -10239,7 +10239,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_UniformBlockBinding(table, save_UniformBlockBinding);
/* GL_NV_primitive_restart */
- SET_PrimitiveRestartIndexNV(table, _mesa_PrimitiveRestartIndex);
+ SET_PrimitiveRestartIndex(table, _mesa_PrimitiveRestartIndex);
return table;
}
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c
index d5cac22bd..7285805c8 100644
--- a/mesalib/src/mesa/main/drawtex.c
+++ b/mesalib/src/mesa/main/drawtex.c
@@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, x, y, z, width, height);
@@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords)
+_mesa_DrawTexfvOES(const GLfloat *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
@@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords)
void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords)
+_mesa_DrawTexivOES(const GLint *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
@@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords)
void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords)
+_mesa_DrawTexsvOES(const GLshort *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
diff --git a/mesalib/src/mesa/main/drawtex.h b/mesalib/src/mesa/main/drawtex.h
index 938b65fb2..b916150b7 100644
--- a/mesalib/src/mesa/main/drawtex.h
+++ b/mesalib/src/mesa/main/drawtex.h
@@ -30,22 +30,22 @@
extern void GLAPIENTRY
-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
extern void GLAPIENTRY
-_mesa_DrawTexfv(const GLfloat *coords);
+_mesa_DrawTexfvOES(const GLfloat *coords);
extern void GLAPIENTRY
-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
+_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height);
extern void GLAPIENTRY
-_mesa_DrawTexiv(const GLint *coords);
+_mesa_DrawTexivOES(const GLint *coords);
extern void GLAPIENTRY
-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
extern void GLAPIENTRY
-_mesa_DrawTexsv(const GLshort *coords);
+_mesa_DrawTexsvOES(const GLshort *coords);
extern void GLAPIENTRY
_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index e704f2f2d..c7114b73a 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -1072,7 +1072,7 @@ invalid_enum_error:
void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index )
+_mesa_Disablei( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1081,7 +1081,7 @@ _mesa_DisableIndexed( GLenum cap, GLuint index )
void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index )
+_mesa_Enablei( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1090,7 +1090,7 @@ _mesa_EnableIndexed( GLenum cap, GLuint index )
GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index )
+_mesa_IsEnabledi( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
diff --git a/mesalib/src/mesa/main/enable.h b/mesalib/src/mesa/main/enable.h
index be7909459..5b2515d59 100644
--- a/mesalib/src/mesa/main/enable.h
+++ b/mesalib/src/mesa/main/enable.h
@@ -53,13 +53,13 @@ extern void
_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);
extern void GLAPIENTRY
-_mesa_DisableIndexed( GLenum cap, GLuint index );
+_mesa_Disablei( GLenum cap, GLuint index );
extern void GLAPIENTRY
-_mesa_EnableIndexed( GLenum cap, GLuint index );
+_mesa_Enablei( GLenum cap, GLuint index );
extern GLboolean GLAPIENTRY
-_mesa_IsEnabledIndexed( GLenum cap, GLuint index );
+_mesa_IsEnabledi( GLenum cap, GLuint index );
extern void GLAPIENTRY
_mesa_EnableClientState( GLenum cap );
diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c
index 993147c47..cd527dd78 100644
--- a/mesalib/src/mesa/main/es1_conversion.c
+++ b/mesalib/src/mesa/main/es1_conversion.c
@@ -30,13 +30,13 @@
#include "main/es1_conversion.h"
void GL_APIENTRY
-_es_AlphaFuncx(GLenum func, GLclampx ref)
+_mesa_AlphaFuncx(GLenum func, GLclampx ref)
{
_mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
}
void GL_APIENTRY
-_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
+_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
{
_mesa_ClearColor((GLclampf) (red / 65536.0f),
(GLclampf) (green / 65536.0f),
@@ -45,13 +45,13 @@ _es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
}
void GL_APIENTRY
-_es_ClearDepthx(GLclampx depth)
+_mesa_ClearDepthx(GLclampx depth)
{
_mesa_ClearDepthf((GLclampf) (depth / 65536.0f));
}
void GL_APIENTRY
-_es_ClipPlanef(GLenum plane, const GLfloat *equation)
+_mesa_ClipPlanef(GLenum plane, const GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@@ -64,7 +64,7 @@ _es_ClipPlanef(GLenum plane, const GLfloat *equation)
}
void GL_APIENTRY
-_es_ClipPlanex(GLenum plane, const GLfixed *equation)
+_mesa_ClipPlanex(GLenum plane, const GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@@ -86,7 +86,7 @@ _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
}
void GL_APIENTRY
-_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
+_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
{
_es_Color4f((GLfloat) (red / 65536.0f),
(GLfloat) (green / 65536.0f),
@@ -95,17 +95,17 @@ _es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
}
void GL_APIENTRY
-_es_DepthRangex(GLclampx zNear, GLclampx zFar)
+_mesa_DepthRangex(GLclampx zNear, GLclampx zFar)
{
_mesa_DepthRangef((GLclampf) (zNear / 65536.0f),
(GLclampf) (zFar / 65536.0f));
}
void GL_APIENTRY
-_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
+_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
{
- _mesa_DrawTexf((GLfloat) (x / 65536.0f),
+ _mesa_DrawTexfOES((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f),
(GLfloat) (w / 65536.0f),
@@ -113,7 +113,7 @@ _es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
}
void GL_APIENTRY
-_es_DrawTexxvOES(const GLfixed *coords)
+_mesa_DrawTexxvOES(const GLfixed *coords)
{
unsigned int i;
GLfloat converted_coords[5];
@@ -122,11 +122,11 @@ _es_DrawTexxvOES(const GLfixed *coords)
converted_coords[i] = (GLfloat) (coords[i] / 65536.0f);
}
- _mesa_DrawTexfv(converted_coords);
+ _mesa_DrawTexfvOES(converted_coords);
}
void GL_APIENTRY
-_es_Fogx(GLenum pname, GLfixed param)
+_mesa_Fogx(GLenum pname, GLfixed param)
{
if (pname != GL_FOG_MODE) {
_mesa_Fogf(pname, (GLfloat) (param / 65536.0f));
@@ -137,7 +137,7 @@ _es_Fogx(GLenum pname, GLfixed param)
}
void GL_APIENTRY
-_es_Fogxv(GLenum pname, const GLfixed *params)
+_mesa_Fogxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -177,7 +177,7 @@ _es_Fogxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Frustum((GLdouble) (left),
@@ -189,7 +189,7 @@ _es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
-_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Frustum((GLdouble) (left / 65536.0),
@@ -201,7 +201,7 @@ _es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
-_es_GetClipPlanef(GLenum plane, GLfloat *equation)
+_mesa_GetClipPlanef(GLenum plane, GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@@ -213,7 +213,7 @@ _es_GetClipPlanef(GLenum plane, GLfloat *equation)
}
void GL_APIENTRY
-_es_GetClipPlanex(GLenum plane, GLfixed *equation)
+_mesa_GetClipPlanex(GLenum plane, GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@@ -225,7 +225,7 @@ _es_GetClipPlanex(GLenum plane, GLfixed *equation)
}
void GL_APIENTRY
-_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
+_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -266,7 +266,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
-_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
+_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -304,7 +304,7 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
-_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
+_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -396,13 +396,13 @@ _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
}
void GL_APIENTRY
-_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
+_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
{
_mesa_GetTexGeniv(coord, pname, (GLint *) params);
}
void GL_APIENTRY
-_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
+_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -450,13 +450,13 @@ _es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
-_es_LightModelx(GLenum pname, GLfixed param)
+_mesa_LightModelx(GLenum pname, GLfixed param)
{
_mesa_LightModelf(pname, (GLfloat) param);
}
void GL_APIENTRY
-_es_LightModelxv(GLenum pname, const GLfixed *params)
+_mesa_LightModelxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -491,13 +491,13 @@ _es_LightModelxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_Lightx(GLenum light, GLenum pname, GLfixed param)
+_mesa_Lightx(GLenum light, GLenum pname, GLfixed param)
{
_mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
-_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
+_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -539,13 +539,13 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_LineWidthx(GLfixed width)
+_mesa_LineWidthx(GLfixed width)
{
_mesa_LineWidth((GLfloat) (width / 65536.0f));
}
void GL_APIENTRY
-_es_LoadMatrixx(const GLfixed *m)
+_mesa_LoadMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
@@ -558,7 +558,7 @@ _es_LoadMatrixx(const GLfixed *m)
}
void GL_APIENTRY
-_es_Materialx(GLenum face, GLenum pname, GLfixed param)
+_mesa_Materialx(GLenum face, GLenum pname, GLfixed param)
{
if (face != GL_FRONT_AND_BACK) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
@@ -576,7 +576,7 @@ _es_Materialx(GLenum face, GLenum pname, GLfixed param)
}
void GL_APIENTRY
-_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
+_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -613,7 +613,7 @@ _es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_MultMatrixx(const GLfixed *m)
+_mesa_MultMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
@@ -626,7 +626,7 @@ _es_MultMatrixx(const GLfixed *m)
}
void GL_APIENTRY
-_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
+_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
{
_es_MultiTexCoord4f(texture,
(GLfloat) (s / 65536.0f),
@@ -636,7 +636,7 @@ _es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
}
void GL_APIENTRY
-_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
+_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
{
_es_Normal3f((GLfloat) (nx / 65536.0f),
(GLfloat) (ny / 65536.0f),
@@ -644,7 +644,7 @@ _es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
}
void GL_APIENTRY
-_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Ortho((GLdouble) (left),
@@ -656,7 +656,7 @@ _es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
-_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Ortho((GLdouble) (left / 65536.0),
@@ -668,13 +668,13 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
-_es_PointParameterx(GLenum pname, GLfixed param)
+_mesa_PointParameterx(GLenum pname, GLfixed param)
{
_mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
-_es_PointParameterxv(GLenum pname, const GLfixed *params)
+_mesa_PointParameterxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 3;
@@ -703,20 +703,20 @@ _es_PointParameterxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_PointSizex(GLfixed size)
+_mesa_PointSizex(GLfixed size)
{
_mesa_PointSize((GLfloat) (size / 65536.0f));
}
void GL_APIENTRY
-_es_PolygonOffsetx(GLfixed factor, GLfixed units)
+_mesa_PolygonOffsetx(GLfixed factor, GLfixed units)
{
_mesa_PolygonOffset((GLfloat) (factor / 65536.0f),
(GLfloat) (units / 65536.0f));
}
void GL_APIENTRY
-_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
+_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Rotatef((GLfloat) (angle / 65536.0f),
(GLfloat) (x / 65536.0f),
@@ -725,14 +725,14 @@ _es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
-_es_SampleCoveragex(GLclampx value, GLboolean invert)
+_mesa_SampleCoveragex(GLclampx value, GLboolean invert)
{
- _mesa_SampleCoverageARB((GLclampf) (value / 65536.0f),
+ _mesa_SampleCoverage((GLclampf) (value / 65536.0f),
invert);
}
void GL_APIENTRY
-_es_Scalex(GLfixed x, GLfixed y, GLfixed z)
+_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Scalef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
@@ -740,7 +740,7 @@ _es_Scalex(GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
-_es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
+_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param)
{
switch(target) {
case GL_POINT_SPRITE:
@@ -785,7 +785,7 @@ _es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
-_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
+_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
{
switch(target) {
case GL_POINT_SPRITE:
@@ -853,19 +853,19 @@ _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params)
}
void GL_APIENTRY
-_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
+_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
{
_es_TexGenf(coord, pname, (GLfloat) param);
}
void GL_APIENTRY
-_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
+_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
{
_es_TexGenf(coord, pname, (GLfloat) params[0]);
}
void GL_APIENTRY
-_es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
+_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param)
{
if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
_mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
@@ -875,7 +875,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
-_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
+_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@@ -930,7 +930,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
-_es_Translatex(GLfixed x, GLfixed y, GLfixed z)
+_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Translatef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
diff --git a/mesalib/src/mesa/main/es1_conversion.h b/mesalib/src/mesa/main/es1_conversion.h
index eb0734759..868a75bab 100644
--- a/mesalib/src/mesa/main/es1_conversion.h
+++ b/mesalib/src/mesa/main/es1_conversion.h
@@ -29,140 +29,140 @@
#endif
void GL_APIENTRY
-_es_AlphaFuncx(GLenum func, GLclampx ref);
+_mesa_AlphaFuncx(GLenum func, GLclampx ref);
void GL_APIENTRY
-_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
void GL_APIENTRY
-_es_ClearDepthx(GLclampx depth);
+_mesa_ClearDepthx(GLclampx depth);
void GL_APIENTRY
-_es_ClipPlanef(GLenum plane, const GLfloat *equation);
+_mesa_ClipPlanef(GLenum plane, const GLfloat *equation);
void GL_APIENTRY
-_es_ClipPlanex(GLenum plane, const GLfixed *equation);
+_mesa_ClipPlanex(GLenum plane, const GLfixed *equation);
void GL_APIENTRY
_es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
void GL_APIENTRY
-_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
void GL_APIENTRY
-_es_DepthRangex(GLclampx zNear, GLclampx zFar);
+_mesa_DepthRangex(GLclampx zNear, GLclampx zFar);
void GL_APIENTRY
-_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
+_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
void GL_APIENTRY
-_es_DrawTexxvOES(const GLfixed *coords);
+_mesa_DrawTexxvOES(const GLfixed *coords);
void GL_APIENTRY
-_es_Fogx(GLenum pname, GLfixed param);
+_mesa_Fogx(GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_Fogxv(GLenum pname, const GLfixed *params);
+_mesa_Fogxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
void GL_APIENTRY
-_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar);
void GL_APIENTRY
-_es_GetClipPlanef(GLenum plane, GLfloat *equation);
+_mesa_GetClipPlanef(GLenum plane, GLfloat *equation);
void GL_APIENTRY
-_es_GetClipPlanex(GLenum plane, GLfixed *equation);
+_mesa_GetClipPlanex(GLenum plane, GLfixed *equation);
void GL_APIENTRY
-_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
+_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
void GL_APIENTRY
-_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
+_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
void GL_APIENTRY
_check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params);
void GL_APIENTRY
-_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
+_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
void GL_APIENTRY
-_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
+_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
void GL_APIENTRY
-_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
+_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
void GL_APIENTRY
-_es_LightModelx(GLenum pname, GLfixed param);
+_mesa_LightModelx(GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_LightModelxv(GLenum pname, const GLfixed *params);
+_mesa_LightModelxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_Lightx(GLenum light, GLenum pname, GLfixed param);
+_mesa_Lightx(GLenum light, GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
+_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_LineWidthx(GLfixed width);
+_mesa_LineWidthx(GLfixed width);
void GL_APIENTRY
-_es_LoadMatrixx(const GLfixed *m);
+_mesa_LoadMatrixx(const GLfixed *m);
void GL_APIENTRY
-_es_Materialx(GLenum face, GLenum pname, GLfixed param);
+_mesa_Materialx(GLenum face, GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
+_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_MultMatrixx(const GLfixed *m);
+_mesa_MultMatrixx(const GLfixed *m);
void GL_APIENTRY
-_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
void GL_APIENTRY
-_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
+_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
void GL_APIENTRY
-_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
+_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
void GL_APIENTRY
-_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
+_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar);
void GL_APIENTRY
-_es_PointParameterx(GLenum pname, GLfixed param);
+_mesa_PointParameterx(GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_PointParameterxv(GLenum pname, const GLfixed *params);
+_mesa_PointParameterxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_PointSizex(GLfixed size);
+_mesa_PointSizex(GLfixed size);
void GL_APIENTRY
-_es_PolygonOffsetx(GLfixed factor, GLfixed units);
+_mesa_PolygonOffsetx(GLfixed factor, GLfixed units);
void GL_APIENTRY
-_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
void GL_APIENTRY
-_es_SampleCoveragex(GLclampx value, GLboolean invert);
+_mesa_SampleCoveragex(GLclampx value, GLboolean invert);
void GL_APIENTRY
-_es_Scalex(GLfixed x, GLfixed y, GLfixed z);
+_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z);
void GL_APIENTRY
-_es_TexEnvx(GLenum target, GLenum pname, GLfixed param);
+_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
+_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_check_TexGeniOES(GLenum coord, GLenum pname, GLint param);
@@ -171,18 +171,18 @@ void GL_APIENTRY
_check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params);
void GL_APIENTRY
-_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
+_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
void GL_APIENTRY
-_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
+_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_TexParameterx(GLenum target, GLenum pname, GLfixed param);
+_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param);
void GL_APIENTRY
-_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
+_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
void GL_APIENTRY
-_es_Translatex(GLfixed x, GLfixed y, GLfixed z);
+_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z);
#endif /* ES1_CONVERSION_H */
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 0618b7fab..ef739c162 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -883,7 +883,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer)
+_mesa_IsRenderbuffer(GLuint renderbuffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -897,7 +897,7 @@ _mesa_IsRenderbufferEXT(GLuint renderbuffer)
void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
+_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer)
{
struct gl_renderbuffer *newRb;
GET_CURRENT_CONTEXT(ctx);
@@ -969,7 +969,7 @@ detach_renderbuffer(struct gl_context *ctx,
void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
+_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@@ -986,7 +986,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
if (rb == ctx->CurrentRenderbuffer) {
/* bind default */
ASSERT(rb->RefCount >= 2);
- _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+ _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
}
if (_mesa_is_user_fbo(ctx->DrawBuffer)) {
@@ -1014,7 +1014,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)
+_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@@ -1398,9 +1398,9 @@ invalidate_rb(GLuint key, void *data, void *userData)
/**
- * Helper function used by _mesa_RenderbufferStorageEXT() and
+ * Helper function used by _mesa_RenderbufferStorage() and
* _mesa_RenderbufferStorageMultisample().
- * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().
+ * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorage().
*/
static void
renderbuffer_storage(GLenum target, GLenum internalFormat,
@@ -1526,8 +1526,8 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
/**
- * Helper function for _mesa_GetRenderbufferParameterivEXT() and
- * _mesa_GetFramebufferAttachmentParameterivEXT()
+ * Helper function for _mesa_GetRenderbufferParameteriv() and
+ * _mesa_GetFramebufferAttachmentParameteriv()
* We have to be careful to respect the base format. For example, if a
* renderbuffer/texture was created with internalFormat=GL_RGB but the
* driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE
@@ -1545,7 +1545,7 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format)
void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+_mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
GLsizei width, GLsizei height)
{
/* GL_ARB_fbo says calling this function is equivalent to calling
@@ -1587,7 +1587,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
+_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
struct gl_renderbuffer *rb;
GET_CURRENT_CONTEXT(ctx);
@@ -1645,7 +1645,7 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer)
+_mesa_IsFramebuffer(GLuint framebuffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -1705,7 +1705,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
+_mesa_BindFramebuffer(GLenum target, GLuint framebuffer)
{
struct gl_framebuffer *newDrawFb, *newReadFb;
struct gl_framebuffer *oldDrawFb, *oldReadFb;
@@ -1839,7 +1839,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
+_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@@ -1860,12 +1860,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
if (fb == ctx->DrawBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
- _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
+ _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
}
if (fb == ctx->ReadBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
- _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
+ _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0);
}
}
else {
@@ -1873,7 +1873,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
- _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
}
}
@@ -1893,7 +1893,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
+_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@@ -1924,7 +1924,7 @@ _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target)
+_mesa_CheckFramebufferStatus(GLenum target)
{
struct gl_framebuffer *buffer;
GET_CURRENT_CONTEXT(ctx);
@@ -2151,7 +2151,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2184,7 +2184,7 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2230,7 +2230,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
GLint level, GLint zoffset)
{
@@ -2248,7 +2248,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLint layer)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2259,7 +2259,7 @@ _mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
GLenum renderbufferTarget,
GLuint renderbuffer)
{
@@ -2343,7 +2343,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
+_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
GLenum pname, GLint *params)
{
const struct gl_renderbuffer_attachment *att;
@@ -2575,7 +2575,7 @@ invalid_pname_enum:
void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target)
+_mesa_GenerateMipmap(GLenum target)
{
struct gl_texture_image *srcImage;
struct gl_texture_object *texObj;
@@ -2833,7 +2833,7 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb,
* when the samples must be resolved to a single color.
*/
void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter)
{
diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h
index 44d92d421..9207f59c7 100644
--- a/mesalib/src/mesa/main/fbobject.h
+++ b/mesalib/src/mesa/main/fbobject.h
@@ -124,19 +124,19 @@ extern GLenum
_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
extern GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer);
+_mesa_IsRenderbuffer(GLuint renderbuffer);
extern void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
+_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer);
extern void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
+_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
extern void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
+_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
extern void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
+_mesa_RenderbufferStorage(GLenum target, GLenum internalformat,
GLsizei width, GLsizei height);
extern void GLAPIENTRY
@@ -152,56 +152,56 @@ extern void GLAPIENTRY
_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
extern void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
+_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname,
GLint *params);
extern GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer);
+_mesa_IsFramebuffer(GLuint framebuffer);
extern void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
+_mesa_BindFramebuffer(GLenum target, GLuint framebuffer);
extern void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
+_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
extern void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
+_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers);
extern GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target);
+_mesa_CheckFramebufferStatus(GLenum target);
extern void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level);
extern void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level);
extern void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
GLint level, GLint zoffset);
extern void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLint layer);
extern void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
+_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
GLenum renderbuffertarget,
GLuint renderbuffer);
extern void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
+_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
GLenum pname, GLint *params);
extern void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target);
+_mesa_GenerateMipmap(GLenum target);
extern void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);
diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c
index 4cdec2166..efdca015e 100644
--- a/mesalib/src/mesa/main/ffvertex_prog.c
+++ b/mesalib/src/mesa/main/ffvertex_prog.c
@@ -160,8 +160,6 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key )
key->need_eye_coords = ctx->_NeedEyeCoords;
- /* Make sure fp->Base.InputsRead fits in a 12-bit field */
- assert(fp->Base.InputsRead < (1 << 12));
key->fragprog_inputs_read = fp->Base.InputsRead;
key->varying_vp_inputs = ctx->varying_vp_inputs;
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 39709b808..e1ebd1856 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1614,7 +1614,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
}
void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
+_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params )
{
union value v;
enum value_type type =
@@ -1639,7 +1639,7 @@ _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
}
void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
+_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
{
union value v;
enum value_type type =
diff --git a/mesalib/src/mesa/main/get.h b/mesalib/src/mesa/main/get.h
index 9422efec5..4daa1aec1 100644
--- a/mesalib/src/mesa/main/get.h
+++ b/mesalib/src/mesa/main/get.h
@@ -54,10 +54,10 @@ extern void GLAPIENTRY
_mesa_GetFixedv(GLenum pname, GLfixed *params);
extern void GLAPIENTRY
-_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params );
+_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params );
extern void GLAPIENTRY
-_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params );
+_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
extern void GLAPIENTRY
_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params );
diff --git a/mesalib/src/mesa/main/hash.c b/mesalib/src/mesa/main/hash.c
index 61c369a80..8c763e20a 100644
--- a/mesalib/src/mesa/main/hash.c
+++ b/mesalib/src/mesa/main/hash.c
@@ -34,40 +34,75 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
#include "glheader.h"
#include "imports.h"
#include "glapi/glthread.h"
#include "hash.h"
-
-
-#define TABLE_SIZE 1023 /**< Size of lookup table/array */
-
-#define HASH_FUNC(K) ((K) % TABLE_SIZE)
-
+#include "hash_table.h"
/**
- * An entry in the hash table.
+ * Magic GLuint object name that gets stored outside of the struct hash_table.
+ *
+ * The hash table needs a particular pointer to be the marker for a key that
+ * was deleted from the table, along with NULL for the "never allocated in the
+ * table" marker. Legacy GL allows any GLuint to be used as a GL object name,
+ * and we use a 1:1 mapping from GLuints to key pointers, so we need to be
+ * able to track a GLuint that happens to match the deleted key outside of
+ * struct hash_table. We tell the hash table to use "1" as the deleted key
+ * value, so that we test the deleted-key-in-the-table path as best we can.
*/
-struct HashEntry {
- GLuint Key; /**< the entry's key */
- void *Data; /**< the entry's data */
- struct HashEntry *Next; /**< pointer to next entry */
-};
-
+#define DELETED_KEY_VALUE 1
/**
* The hash table data structure.
*/
struct _mesa_HashTable {
- struct HashEntry *Table[TABLE_SIZE]; /**< the lookup table */
+ struct hash_table *ht;
GLuint MaxKey; /**< highest key inserted so far */
_glthread_Mutex Mutex; /**< mutual exclusion lock */
_glthread_Mutex WalkMutex; /**< for _mesa_HashWalk() */
GLboolean InDeleteAll; /**< Debug check */
+ /** Value that would be in the table for DELETED_KEY_VALUE. */
+ void *deleted_key_data;
};
+/** @{
+ * Mapping from our use of GLuint as both the key and the hash value to the
+ * hash_table.h API
+ *
+ * There exist many integer hash functions, designed to avoid collisions when
+ * the integers are spread across key space with some patterns. In GL, the
+ * pattern (in the case of glGen*()ed object IDs) is that the keys are unique
+ * contiguous integers starting from 1. Because of that, we just use the key
+ * as the hash value, to minimize the cost of the hash function. If objects
+ * are never deleted, we will never see a collision in the table, because the
+ * table resizes itself when it approaches full, and thus key % table_size ==
+ * key.
+ *
+ * The case where we could have collisions for genned objects would be
+ * something like: glGenBuffers(&a, 100); glDeleteBuffers(&a + 50, 50);
+ * glGenBuffers(&b, 100), because objects 1-50 and 101-200 are allocated at
+ * the end of that sequence, instead of 1-150. So far it doesn't appear to be
+ * a problem.
+ */
+static bool
+uint_key_compare(const void *a, const void *b)
+{
+ return a == b;
+}
+
+static uint32_t
+uint_hash(GLuint id)
+{
+ return id;
+}
+static void *
+uint_key(GLuint id)
+{
+ return (void *)(uintptr_t) id;
+}
+/** @} */
/**
* Create a new hash table.
@@ -78,6 +113,9 @@ struct _mesa_HashTable *
_mesa_NewHashTable(void)
{
struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable);
+
+ table->ht = _mesa_hash_table_create(NULL, uint_key_compare);
+ _mesa_hash_table_set_deleted_key(table->ht, uint_key(DELETED_KEY_VALUE));
if (table) {
_glthread_INIT_MUTEX(table->Mutex);
_glthread_INIT_MUTEX(table->WalkMutex);
@@ -98,20 +136,14 @@ _mesa_NewHashTable(void)
void
_mesa_DeleteHashTable(struct _mesa_HashTable *table)
{
- GLuint pos;
assert(table);
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- struct HashEntry *entry = table->Table[pos];
- while (entry) {
- struct HashEntry *next = entry->Next;
- if (entry->Data) {
- _mesa_problem(NULL,
- "In _mesa_DeleteHashTable, found non-freed data");
- }
- free(entry);
- entry = next;
- }
+
+ if (_mesa_hash_table_next_entry(table->ht, NULL) != NULL) {
+ _mesa_problem(NULL, "In _mesa_DeleteHashTable, found non-freed data");
}
+
+ _mesa_hash_table_destroy(table->ht, NULL);
+
_glthread_DESTROY_MUTEX(table->Mutex);
_glthread_DESTROY_MUTEX(table->WalkMutex);
free(table);
@@ -126,21 +158,19 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
static inline void *
_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
{
- GLuint pos;
- const struct HashEntry *entry;
+ const struct hash_entry *entry;
assert(table);
assert(key);
- pos = HASH_FUNC(key);
- entry = table->Table[pos];
- while (entry) {
- if (entry->Key == key) {
- return entry->Data;
- }
- entry = entry->Next;
- }
- return NULL;
+ if (key == DELETED_KEY_VALUE)
+ return table->deleted_key_data;
+
+ entry = _mesa_hash_table_search(table->ht, uint_hash(key), uint_key(key));
+ if (!entry)
+ return NULL;
+
+ return entry->data;
}
@@ -175,9 +205,8 @@ _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key)
void
_mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
{
- /* search for existing entry with this key */
- GLuint pos;
- struct HashEntry *entry;
+ uint32_t hash = uint_hash(key);
+ struct hash_entry *entry;
assert(table);
assert(key);
@@ -187,32 +216,17 @@ _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
if (key > table->MaxKey)
table->MaxKey = key;
- pos = HASH_FUNC(key);
-
- /* check if replacing an existing entry with same key */
- for (entry = table->Table[pos]; entry; entry = entry->Next) {
- if (entry->Key == key) {
- /* replace entry's data */
-#if 0 /* not sure this check is always valid */
- if (entry->Data) {
- _mesa_problem(NULL, "Memory leak detected in _mesa_HashInsert");
- }
-#endif
- entry->Data = data;
- _glthread_UNLOCK_MUTEX(table->Mutex);
- return;
+ if (key == DELETED_KEY_VALUE) {
+ table->deleted_key_data = data;
+ } else {
+ entry = _mesa_hash_table_search(table->ht, hash, uint_key(key));
+ if (entry) {
+ entry->data = data;
+ } else {
+ _mesa_hash_table_insert(table->ht, hash, uint_key(key), data);
}
}
- /* alloc and insert new table entry */
- entry = MALLOC_STRUCT(HashEntry);
- if (entry) {
- entry->Key = key;
- entry->Data = data;
- entry->Next = table->Table[pos];
- table->Table[pos] = entry;
- }
-
_glthread_UNLOCK_MUTEX(table->Mutex);
}
@@ -230,8 +244,7 @@ _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
void
_mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
{
- GLuint pos;
- struct HashEntry *entry, *prev;
+ struct hash_entry *entry;
assert(table);
assert(key);
@@ -244,27 +257,12 @@ _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
}
_glthread_LOCK_MUTEX(table->Mutex);
-
- pos = HASH_FUNC(key);
- prev = NULL;
- entry = table->Table[pos];
- while (entry) {
- if (entry->Key == key) {
- /* found it! */
- if (prev) {
- prev->Next = entry->Next;
- }
- else {
- table->Table[pos] = entry->Next;
- }
- free(entry);
- _glthread_UNLOCK_MUTEX(table->Mutex);
- return;
- }
- prev = entry;
- entry = entry->Next;
+ if (key == DELETED_KEY_VALUE) {
+ table->deleted_key_data = NULL;
+ } else {
+ entry = _mesa_hash_table_search(table->ht, uint_hash(key), uint_key(key));
+ _mesa_hash_table_remove(table->ht, entry);
}
-
_glthread_UNLOCK_MUTEX(table->Mutex);
}
@@ -284,19 +282,19 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
void *userData)
{
- GLuint pos;
+ struct hash_entry *entry;
+
ASSERT(table);
ASSERT(callback);
_glthread_LOCK_MUTEX(table->Mutex);
table->InDeleteAll = GL_TRUE;
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- struct HashEntry *entry, *next;
- for (entry = table->Table[pos]; entry; entry = next) {
- callback(entry->Key, entry->Data, userData);
- next = entry->Next;
- free(entry);
- }
- table->Table[pos] = NULL;
+ hash_table_foreach(table->ht, entry) {
+ callback((uintptr_t)entry->key, entry->data, userData);
+ _mesa_hash_table_remove(table->ht, entry);
+ }
+ if (table->deleted_key_data) {
+ callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
+ table->deleted_key_data = NULL;
}
table->InDeleteAll = GL_FALSE;
_glthread_UNLOCK_MUTEX(table->Mutex);
@@ -322,93 +320,25 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
{
/* cast-away const */
struct _mesa_HashTable *table2 = (struct _mesa_HashTable *) table;
- GLuint pos;
+ struct hash_entry *entry;
+
ASSERT(table);
ASSERT(callback);
_glthread_LOCK_MUTEX(table2->WalkMutex);
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- struct HashEntry *entry, *next;
- for (entry = table->Table[pos]; entry; entry = next) {
- /* save 'next' pointer now in case the callback deletes the entry */
- next = entry->Next;
- callback(entry->Key, entry->Data, userData);
- }
+ hash_table_foreach(table->ht, entry) {
+ callback((uintptr_t)entry->key, entry->data, userData);
}
+ if (table->deleted_key_data)
+ callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
_glthread_UNLOCK_MUTEX(table2->WalkMutex);
}
-
-/**
- * Return the key of the "first" entry in the hash table.
- * While holding the lock, walks through all table positions until finding
- * the first entry of the first non-empty one.
- *
- * \param table the hash table
- * \return key for the "first" entry in the hash table.
- */
-GLuint
-_mesa_HashFirstEntry(struct _mesa_HashTable *table)
-{
- GLuint pos;
- assert(table);
- _glthread_LOCK_MUTEX(table->Mutex);
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- if (table->Table[pos]) {
- _glthread_UNLOCK_MUTEX(table->Mutex);
- return table->Table[pos]->Key;
- }
- }
- _glthread_UNLOCK_MUTEX(table->Mutex);
- return 0;
-}
-
-
-/**
- * Given a hash table key, return the next key. This is used to walk
- * over all entries in the table. Note that the keys returned during
- * walking won't be in any particular order.
- * \return next hash key or 0 if end of table.
- */
-GLuint
-_mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key)
+static void
+debug_print_entry(GLuint key, void *data, void *userData)
{
- const struct HashEntry *entry;
- GLuint pos;
-
- assert(table);
- assert(key);
-
- /* Find the entry with given key */
- pos = HASH_FUNC(key);
- for (entry = table->Table[pos]; entry ; entry = entry->Next) {
- if (entry->Key == key) {
- break;
- }
- }
-
- if (!entry) {
- /* the given key was not found, so we can't find the next entry */
- return 0;
- }
-
- if (entry->Next) {
- /* return next in linked list */
- return entry->Next->Key;
- }
- else {
- /* look for next non-empty table slot */
- pos++;
- while (pos < TABLE_SIZE) {
- if (table->Table[pos]) {
- return table->Table[pos]->Key;
- }
- pos++;
- }
- return 0;
- }
+ _mesa_debug(NULL, "%u %p\n", key, data);
}
-
/**
* Dump contents of hash table for debugging.
*
@@ -417,19 +347,12 @@ _mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key)
void
_mesa_HashPrint(const struct _mesa_HashTable *table)
{
- GLuint pos;
- assert(table);
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- const struct HashEntry *entry = table->Table[pos];
- while (entry) {
- _mesa_debug(NULL, "%u %p\n", entry->Key, entry->Data);
- entry = entry->Next;
- }
- }
+ if (table->deleted_key_data)
+ debug_print_entry(DELETED_KEY_VALUE, table->deleted_key_data, NULL);
+ _mesa_HashWalk(table, debug_print_entry, NULL);
}
-
/**
* Find a block of adjacent unused hash keys.
*
@@ -446,7 +369,7 @@ _mesa_HashPrint(const struct _mesa_HashTable *table)
GLuint
_mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
{
- const GLuint maxKey = ~((GLuint) 0);
+ const GLuint maxKey = ~((GLuint) 0) - 1;
_glthread_LOCK_MUTEX(table->Mutex);
if (maxKey - numKeys > table->MaxKey) {
/* the quick solution */
@@ -486,82 +409,14 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
GLuint
_mesa_HashNumEntries(const struct _mesa_HashTable *table)
{
- GLuint pos, count = 0;
+ struct hash_entry *entry;
+ GLuint count = 0;
- for (pos = 0; pos < TABLE_SIZE; pos++) {
- const struct HashEntry *entry;
- for (entry = table->Table[pos]; entry; entry = entry->Next) {
- count++;
- }
- }
+ if (table->deleted_key_data)
+ count++;
- return count;
-}
-
-
-
-#if 0 /* debug only */
+ hash_table_foreach(table->ht, entry)
+ count++;
-/**
- * Test walking over all the entries in a hash table.
- */
-static void
-test_hash_walking(void)
-{
- struct _mesa_HashTable *t = _mesa_NewHashTable();
- const GLuint limit = 50000;
- GLuint i;
-
- /* create some entries */
- for (i = 0; i < limit; i++) {
- GLuint dummy;
- GLuint k = (rand() % (limit * 10)) + 1;
- while (_mesa_HashLookup(t, k)) {
- /* id already in use, try another */
- k = (rand() % (limit * 10)) + 1;
- }
- _mesa_HashInsert(t, k, &dummy);
- }
-
- /* walk over all entries */
- {
- GLuint k = _mesa_HashFirstEntry(t);
- GLuint count = 0;
- while (k) {
- GLuint knext = _mesa_HashNextEntry(t, k);
- assert(knext != k);
- _mesa_HashRemove(t, k);
- count++;
- k = knext;
- }
- assert(count == limit);
- k = _mesa_HashFirstEntry(t);
- assert(k==0);
- }
-
- _mesa_DeleteHashTable(t);
-}
-
-
-void
-_mesa_test_hash_functions(void)
-{
- int a, b, c;
- struct _mesa_HashTable *t;
-
- t = _mesa_NewHashTable();
- _mesa_HashInsert(t, 501, &a);
- _mesa_HashInsert(t, 10, &c);
- _mesa_HashInsert(t, 0xfffffff8, &b);
- /*_mesa_HashPrint(t);*/
-
- assert(_mesa_HashLookup(t,501));
- assert(!_mesa_HashLookup(t,1313));
- assert(_mesa_HashFindFreeKeyBlock(t, 100));
-
- _mesa_DeleteHashTable(t);
-
- test_hash_walking();
+ return count;
}
-
-#endif
diff --git a/mesalib/src/mesa/main/hash.h b/mesalib/src/mesa/main/hash.h
index e935f8d39..cdaa7669a 100644
--- a/mesalib/src/mesa/main/hash.h
+++ b/mesalib/src/mesa/main/hash.h
@@ -55,10 +55,6 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
void *userData);
-extern GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table);
-
-extern GLuint _mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key);
-
extern void _mesa_HashPrint(const struct _mesa_HashTable *table);
extern GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys);
diff --git a/mesalib/src/mesa/main/hash_table.c b/mesalib/src/mesa/main/hash_table.c
new file mode 100644
index 000000000..2bd1929aa
--- /dev/null
+++ b/mesalib/src/mesa/main/hash_table.c
@@ -0,0 +1,442 @@
+/*
+ * Copyright © 2009,2012 Intel Corporation
+ * Copyright © 1988-2004 Keith Packard and Bart Massey.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the names of the authors
+ * or their institutions shall not be used in advertising or
+ * otherwise to promote the sale, use or other dealings in this
+ * Software without prior written authorization from the
+ * authors.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ * Keith Packard <keithp@keithp.com>
+ */
+
+/**
+ * Implements an open-addressing, linear-reprobing hash table.
+ *
+ * For more information, see:
+ *
+ * http://cgit.freedesktop.org/~anholt/hash_table/tree/README
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "main/hash_table.h"
+#include "ralloc.h"
+
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+
+static const uint32_t deleted_key_value;
+
+/**
+ * From Knuth -- a good choice for hash/rehash values is p, p-2 where
+ * p and p-2 are both prime. These tables are sized to have an extra 10%
+ * free to avoid exponential performance degradation as the hash table fills
+ */
+static const struct {
+ uint32_t max_entries, size, rehash;
+} hash_sizes[] = {
+ { 2, 5, 3 },
+ { 4, 7, 5 },
+ { 8, 13, 11 },
+ { 16, 19, 17 },
+ { 32, 43, 41 },
+ { 64, 73, 71 },
+ { 128, 151, 149 },
+ { 256, 283, 281 },
+ { 512, 571, 569 },
+ { 1024, 1153, 1151 },
+ { 2048, 2269, 2267 },
+ { 4096, 4519, 4517 },
+ { 8192, 9013, 9011 },
+ { 16384, 18043, 18041 },
+ { 32768, 36109, 36107 },
+ { 65536, 72091, 72089 },
+ { 131072, 144409, 144407 },
+ { 262144, 288361, 288359 },
+ { 524288, 576883, 576881 },
+ { 1048576, 1153459, 1153457 },
+ { 2097152, 2307163, 2307161 },
+ { 4194304, 4613893, 4613891 },
+ { 8388608, 9227641, 9227639 },
+ { 16777216, 18455029, 18455027 },
+ { 33554432, 36911011, 36911009 },
+ { 67108864, 73819861, 73819859 },
+ { 134217728, 147639589, 147639587 },
+ { 268435456, 295279081, 295279079 },
+ { 536870912, 590559793, 590559791 },
+ { 1073741824, 1181116273, 1181116271},
+ { 2147483648ul, 2362232233ul, 2362232231ul}
+};
+
+static int
+entry_is_free(const struct hash_entry *entry)
+{
+ return entry->key == NULL;
+}
+
+static int
+entry_is_deleted(const struct hash_table *ht, struct hash_entry *entry)
+{
+ return entry->key == ht->deleted_key;
+}
+
+static int
+entry_is_present(const struct hash_table *ht, struct hash_entry *entry)
+{
+ return entry->key != NULL && entry->key != ht->deleted_key;
+}
+
+struct hash_table *
+_mesa_hash_table_create(void *mem_ctx,
+ bool key_equals_function(const void *a,
+ const void *b))
+{
+ struct hash_table *ht;
+
+ ht = ralloc(mem_ctx, struct hash_table);
+ if (ht == NULL)
+ return NULL;
+
+ ht->mem_ctx = mem_ctx;
+ ht->size_index = 0;
+ ht->size = hash_sizes[ht->size_index].size;
+ ht->rehash = hash_sizes[ht->size_index].rehash;
+ ht->max_entries = hash_sizes[ht->size_index].max_entries;
+ ht->key_equals_function = key_equals_function;
+ ht->table = rzalloc_array(ht, struct hash_entry, ht->size);
+ ht->entries = 0;
+ ht->deleted_entries = 0;
+ ht->deleted_key = &deleted_key_value;
+
+ if (ht->table == NULL) {
+ ralloc_free(ht);
+ return NULL;
+ }
+
+ return ht;
+}
+
+/**
+ * Frees the given hash table.
+ *
+ * If delete_function is passed, it gets called on each entry present before
+ * freeing.
+ */
+void
+_mesa_hash_table_destroy(struct hash_table *ht,
+ void (*delete_function)(struct hash_entry *entry))
+{
+ if (!ht)
+ return;
+
+ if (delete_function) {
+ struct hash_entry *entry;
+
+ hash_table_foreach(ht, entry) {
+ delete_function(entry);
+ }
+ }
+ ralloc_free(ht);
+}
+
+/** Sets the value of the key pointer used for deleted entries in the table.
+ *
+ * The assumption is that usually keys are actual pointers, so we use a
+ * default value of a pointer to an arbitrary piece of storage in the library.
+ * But in some cases a consumer wants to store some other sort of value in the
+ * table, like a uint32_t, in which case that pointer may conflict with one of
+ * their valid keys. This lets that user select a safe value.
+ *
+ * This must be called before any keys are actually deleted from the table.
+ */
+void
+_mesa_hash_table_set_deleted_key(struct hash_table *ht, const void *deleted_key)
+{
+ ht->deleted_key = deleted_key;
+}
+
+/**
+ * Finds a hash table entry with the given key and hash of that key.
+ *
+ * Returns NULL if no entry is found. Note that the data pointer may be
+ * modified by the user.
+ */
+struct hash_entry *
+_mesa_hash_table_search(struct hash_table *ht, uint32_t hash,
+ const void *key)
+{
+ uint32_t start_hash_address = hash % ht->size;
+ uint32_t hash_address = start_hash_address;
+
+ do {
+ uint32_t double_hash;
+
+ struct hash_entry *entry = ht->table + hash_address;
+
+ if (entry_is_free(entry)) {
+ return NULL;
+ } else if (entry_is_present(ht, entry) && entry->hash == hash) {
+ if (ht->key_equals_function(key, entry->key)) {
+ return entry;
+ }
+ }
+
+ double_hash = 1 + hash % ht->rehash;
+
+ hash_address = (hash_address + double_hash) % ht->size;
+ } while (hash_address != start_hash_address);
+
+ return NULL;
+}
+
+static void
+_mesa_hash_table_rehash(struct hash_table *ht, int new_size_index)
+{
+ struct hash_table old_ht;
+ struct hash_entry *table, *entry;
+
+ if (new_size_index >= ARRAY_SIZE(hash_sizes))
+ return;
+
+ table = rzalloc_array(ht, struct hash_entry,
+ hash_sizes[new_size_index].size);
+ if (table == NULL)
+ return;
+
+ old_ht = *ht;
+
+ ht->table = table;
+ ht->size_index = new_size_index;
+ ht->size = hash_sizes[ht->size_index].size;
+ ht->rehash = hash_sizes[ht->size_index].rehash;
+ ht->max_entries = hash_sizes[ht->size_index].max_entries;
+ ht->entries = 0;
+ ht->deleted_entries = 0;
+
+ hash_table_foreach(&old_ht, entry) {
+ _mesa_hash_table_insert(ht, entry->hash,
+ entry->key, entry->data);
+ }
+
+ ralloc_free(old_ht.table);
+}
+
+/**
+ * Inserts the key with the given hash into the table.
+ *
+ * Note that insertion may rearrange the table on a resize or rehash,
+ * so previously found hash_entries are no longer valid after this function.
+ */
+struct hash_entry *
+_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash,
+ const void *key, void *data)
+{
+ uint32_t start_hash_address, hash_address;
+
+ if (ht->entries >= ht->max_entries) {
+ _mesa_hash_table_rehash(ht, ht->size_index + 1);
+ } else if (ht->deleted_entries + ht->entries >= ht->max_entries) {
+ _mesa_hash_table_rehash(ht, ht->size_index);
+ }
+
+ start_hash_address = hash % ht->size;
+ hash_address = start_hash_address;
+ do {
+ struct hash_entry *entry = ht->table + hash_address;
+ uint32_t double_hash;
+
+ if (!entry_is_present(ht, entry)) {
+ if (entry_is_deleted(ht, entry))
+ ht->deleted_entries--;
+ entry->hash = hash;
+ entry->key = key;
+ entry->data = data;
+ ht->entries++;
+ return entry;
+ }
+
+ /* Implement replacement when another insert happens
+ * with a matching key. This is a relatively common
+ * feature of hash tables, with the alternative
+ * generally being "insert the new value as well, and
+ * return it first when the key is searched for".
+ *
+ * Note that the hash table doesn't have a delete
+ * callback. If freeing of old data pointers is
+ * required to avoid memory leaks, perform a search
+ * before inserting.
+ */
+ if (entry->hash == hash &&
+ ht->key_equals_function(key, entry->key)) {
+ entry->key = key;
+ entry->data = data;
+ return entry;
+ }
+
+
+ double_hash = 1 + hash % ht->rehash;
+
+ hash_address = (hash_address + double_hash) % ht->size;
+ } while (hash_address != start_hash_address);
+
+ /* We could hit here if a required resize failed. An unchecked-malloc
+ * application could ignore this result.
+ */
+ return NULL;
+}
+
+/**
+ * This function deletes the given hash table entry.
+ *
+ * Note that deletion doesn't otherwise modify the table, so an iteration over
+ * the table deleting entries is safe.
+ */
+void
+_mesa_hash_table_remove(struct hash_table *ht,
+ struct hash_entry *entry)
+{
+ if (!entry)
+ return;
+
+ entry->key = ht->deleted_key;
+ ht->entries--;
+ ht->deleted_entries++;
+}
+
+/**
+ * This function is an iterator over the hash table.
+ *
+ * Pass in NULL for the first entry, as in the start of a for loop. Note that
+ * an iteration over the table is O(table_size) not O(entries).
+ */
+struct hash_entry *
+_mesa_hash_table_next_entry(struct hash_table *ht,
+ struct hash_entry *entry)
+{
+ if (entry == NULL)
+ entry = ht->table;
+ else
+ entry = entry + 1;
+
+ for (; entry != ht->table + ht->size; entry++) {
+ if (entry_is_present(ht, entry)) {
+ return entry;
+ }
+ }
+
+ return NULL;
+}
+
+/**
+ * Returns a random entry from the hash table.
+ *
+ * This may be useful in implementing random replacement (as opposed
+ * to just removing everything) in caches based on this hash table
+ * implementation. @predicate may be used to filter entries, or may
+ * be set to NULL for no filtering.
+ */
+struct hash_entry *
+_mesa_hash_table_random_entry(struct hash_table *ht,
+ bool (*predicate)(struct hash_entry *entry))
+{
+ struct hash_entry *entry;
+ uint32_t i = rand() % ht->size;
+
+ if (ht->entries == 0)
+ return NULL;
+
+ for (entry = ht->table + i; entry != ht->table + ht->size; entry++) {
+ if (entry_is_present(ht, entry) &&
+ (!predicate || predicate(entry))) {
+ return entry;
+ }
+ }
+
+ for (entry = ht->table; entry != ht->table + i; entry++) {
+ if (entry_is_present(ht, entry) &&
+ (!predicate || predicate(entry))) {
+ return entry;
+ }
+ }
+
+ return NULL;
+}
+
+
+/**
+ * Quick FNV-1 hash implementation based on:
+ * http://www.isthe.com/chongo/tech/comp/fnv/
+ *
+ * FNV-1 is not be the best hash out there -- Jenkins's lookup3 is supposed to
+ * be quite good, and it probably beats FNV. But FNV has the advantage that
+ * it involves almost no code. For an improvement on both, see Paul
+ * Hsieh's http://www.azillionmonkeys.com/qed/hash.html
+ */
+uint32_t
+_mesa_hash_data(const void *data, size_t size)
+{
+ uint32_t hash = 2166136261ul;
+ const uint8_t *bytes = data;
+
+ while (size-- != 0) {
+ hash ^= *bytes;
+ hash = hash * 0x01000193;
+ bytes++;
+ }
+
+ return hash;
+}
+
+/** FNV-1 string hash implementation */
+uint32_t
+_mesa_hash_string(const char *key)
+{
+ uint32_t hash = 2166136261ul;
+
+ while (*key != 0) {
+ hash ^= *key;
+ hash = hash * 0x01000193;
+ key++;
+ }
+
+ return hash;
+}
+
+/**
+ * String compare function for use as the comparison callback in
+ * _mesa_hash_table_create().
+ */
+bool
+_mesa_key_string_equal(const void *a, const void *b)
+{
+ return strcmp(a, b) == 0;
+}
+
+bool
+_mesa_key_pointer_equal(const void *a, const void *b)
+{
+ return a == b;
+}
diff --git a/mesalib/src/mesa/main/hash_table.h b/mesalib/src/mesa/main/hash_table.h
new file mode 100644
index 000000000..ad1dae478
--- /dev/null
+++ b/mesalib/src/mesa/main/hash_table.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2009,2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#ifndef _HASH_TABLE_H
+#define _HASH_TABLE_H
+
+#include <inttypes.h>
+#include <stdbool.h>
+
+#include "compiler.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct hash_entry {
+ uint32_t hash;
+ const void *key;
+ void *data;
+};
+
+struct hash_table {
+ void *mem_ctx;
+ struct hash_entry *table;
+ bool (*key_equals_function)(const void *a, const void *b);
+ const void *deleted_key;
+ uint32_t size;
+ uint32_t rehash;
+ uint32_t max_entries;
+ uint32_t size_index;
+ uint32_t entries;
+ uint32_t deleted_entries;
+};
+
+struct hash_table *
+_mesa_hash_table_create(void *mem_ctx,
+ bool (*key_equals_function)(const void *a,
+ const void *b));
+void _mesa_hash_table_destroy(struct hash_table *ht,
+ void (*delete_function)(struct hash_entry *entry));
+void _mesa_hash_table_set_deleted_key(struct hash_table *ht,
+ const void *deleted_key);
+
+struct hash_entry *
+_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash,
+ const void *key, void *data);
+struct hash_entry *
+_mesa_hash_table_search(struct hash_table *ht, uint32_t hash,
+ const void *key);
+void _mesa_hash_table_remove(struct hash_table *ht,
+ struct hash_entry *entry);
+
+struct hash_entry *_mesa_hash_table_next_entry(struct hash_table *ht,
+ struct hash_entry *entry);
+struct hash_entry *
+_mesa_hash_table_random_entry(struct hash_table *ht,
+ bool (*predicate)(struct hash_entry *entry));
+
+uint32_t _mesa_hash_data(const void *data, size_t size);
+uint32_t _mesa_hash_string(const char *key);
+bool _mesa_key_string_equal(const void *a, const void *b);
+bool _mesa_key_pointer_equal(const void *a, const void *b);
+
+static inline uint32_t _mesa_hash_pointer(const void *pointer)
+{
+ return _mesa_hash_data(&pointer, sizeof(pointer));
+}
+
+/**
+ * This foreach function is safe against deletion (which just replaces
+ * an entry's data with the deleted marker), but not against insertion
+ * (which may rehash the table, making entry a dangling pointer).
+ */
+#define hash_table_foreach(ht, entry) \
+ for (entry = _mesa_hash_table_next_entry(ht, NULL); \
+ entry != NULL; \
+ entry = _mesa_hash_table_next_entry(ht, entry))
+
+#ifdef __cplusplus
+} /* extern C */
+#endif
+
+#endif /* _HASH_TABLE_H */
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index ed324b588..76f835e0e 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -59,11 +59,8 @@
#ifdef _WIN32
#define vsnprintf _vsnprintf
-#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
+#elif defined(__IBMC__) || defined(__IBMCPP__)
extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
-#ifdef __VMS
-#include "vsnprintf.c"
-#endif
#endif
/**********************************************************************/
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 40ba75785..8446ea2a3 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -214,8 +214,6 @@ static inline int IS_INF_OR_NAN( float x )
#define IS_INF_OR_NAN(x) (!isfinite(x))
#elif defined(finite)
#define IS_INF_OR_NAN(x) (!finite(x))
-#elif defined(__VMS)
-#define IS_INF_OR_NAN(x) (!finite(x))
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define IS_INF_OR_NAN(x) (!isfinite(x))
#else
diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c
index 042ed1cb8..b0a10e9ed 100644
--- a/mesalib/src/mesa/main/light.c
+++ b/mesalib/src/mesa/main/light.c
@@ -66,7 +66,7 @@ _mesa_ShadeModel( GLenum mode )
* triangle or line.
*/
void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode)
+_mesa_ProvokingVertex(GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
diff --git a/mesalib/src/mesa/main/light.h b/mesalib/src/mesa/main/light.h
index 2e6a5003e..e25dbf226 100644
--- a/mesalib/src/mesa/main/light.h
+++ b/mesalib/src/mesa/main/light.h
@@ -39,7 +39,7 @@ extern void GLAPIENTRY
_mesa_ShadeModel( GLenum mode );
extern void GLAPIENTRY
-_mesa_ProvokingVertexEXT(GLenum mode);
+_mesa_ProvokingVertex(GLenum mode);
extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c
index 3c5968c85..00b8e00b7 100644
--- a/mesalib/src/mesa/main/matrix.c
+++ b/mesalib/src/mesa/main/matrix.c
@@ -489,7 +489,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
+_mesa_LoadTransposeMatrixf( const GLfloat *m )
{
GLfloat tm[16];
if (!m) return;
@@ -499,7 +499,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m )
void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
+_mesa_LoadTransposeMatrixd( const GLdouble *m )
{
GLfloat tm[16];
if (!m) return;
@@ -509,7 +509,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m )
void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m )
+_mesa_MultTransposeMatrixf( const GLfloat *m )
{
GLfloat tm[16];
if (!m) return;
@@ -519,7 +519,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m )
void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m )
+_mesa_MultTransposeMatrixd( const GLdouble *m )
{
GLfloat tm[16];
if (!m) return;
diff --git a/mesalib/src/mesa/main/matrix.h b/mesalib/src/mesa/main/matrix.h
index 2878cc134..185a5c04b 100644
--- a/mesalib/src/mesa/main/matrix.h
+++ b/mesalib/src/mesa/main/matrix.h
@@ -85,16 +85,16 @@ extern void GLAPIENTRY
_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
+_mesa_LoadTransposeMatrixf( const GLfloat *m );
extern void GLAPIENTRY
-_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
+_mesa_LoadTransposeMatrixd( const GLdouble *m );
extern void GLAPIENTRY
-_mesa_MultTransposeMatrixfARB( const GLfloat *m );
+_mesa_MultTransposeMatrixf( const GLfloat *m );
extern void GLAPIENTRY
-_mesa_MultTransposeMatrixdARB( const GLdouble *m );
+_mesa_MultTransposeMatrixd( const GLdouble *m );
extern void
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index b99e71044..da72da9d1 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1203,7 +1203,8 @@ struct gl_texture_image
GLuint WidthLog2; /**< = log2(Width2) */
GLuint HeightLog2; /**< = log2(Height2) */
GLuint DepthLog2; /**< = log2(Depth2) */
- GLuint MaxLog2; /**< = MAX(WidthLog2, HeightLog2) */
+ GLuint MaxNumLevels; /**< = maximum possible number of mipmap
+ levels, computed from the dimensions */
struct gl_texture_object *TexObject; /**< Pointer back to parent object */
GLuint Level; /**< Which mipmap level am I? */
diff --git a/mesalib/src/mesa/main/multisample.c b/mesalib/src/mesa/main/multisample.c
index 67fdb8c9d..347e98e4e 100644
--- a/mesalib/src/mesa/main/multisample.c
+++ b/mesalib/src/mesa/main/multisample.c
@@ -34,7 +34,7 @@
* Called via glSampleCoverageARB
*/
void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
+_mesa_SampleCoverage(GLclampf value, GLboolean invert)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h
index e86d4092b..30726c34c 100644
--- a/mesalib/src/mesa/main/multisample.h
+++ b/mesalib/src/mesa/main/multisample.h
@@ -31,7 +31,7 @@
struct gl_context;
extern void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
+_mesa_SampleCoverage(GLclampf value, GLboolean invert);
extern void
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
index 63d1d8e26..aee8aef12 100644
--- a/mesalib/src/mesa/main/querymatrix.c
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -89,7 +89,7 @@ fpclassify(double x)
#endif
-GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
{
GLfloat matrix[16];
GLint tmp;
diff --git a/mesalib/src/mesa/main/querymatrix.h b/mesalib/src/mesa/main/querymatrix.h
index 37a22e961..187b5f486 100644
--- a/mesalib/src/mesa/main/querymatrix.h
+++ b/mesalib/src/mesa/main/querymatrix.h
@@ -34,6 +34,6 @@
*/
extern GLbitfield GLAPIENTRY
-_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
+_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
#endif
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 5bb3e698b..55d3681c1 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
+_mesa_GenQueries(GLsizei n, GLuint *ids)
{
GLuint first;
GET_CURRENT_CONTEXT(ctx);
@@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
+_mesa_DeleteQueries(GLsizei n, const GLuint *ids)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id)
+_mesa_IsQuery(GLuint id)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index)
}
void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id)
+_mesa_BeginQuery(GLenum target, GLuint id)
{
_mesa_BeginQueryIndexed(target, 0, id);
}
void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target)
+_mesa_EndQuery(GLenum target)
{
_mesa_EndQueryIndexed(target, 0);
}
@@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
}
void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
+_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params)
{
_mesa_GetQueryIndexediv(target, 0, pname, params);
}
void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
+_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
+_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
+_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
+_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@@ -740,20 +740,20 @@ void
_mesa_init_queryobj_dispatch(const struct gl_context *ctx,
struct _glapi_table *disp)
{
- SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
- SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
- SET_IsQueryARB(disp, _mesa_IsQueryARB);
- SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
- SET_EndQueryARB(disp, _mesa_EndQueryARB);
- SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
- SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
+ SET_GenQueries(disp, _mesa_GenQueries);
+ SET_DeleteQueries(disp, _mesa_DeleteQueries);
+ SET_IsQuery(disp, _mesa_IsQuery);
+ SET_BeginQuery(disp, _mesa_BeginQuery);
+ SET_EndQuery(disp, _mesa_EndQuery);
+ SET_GetQueryiv(disp, _mesa_GetQueryiv);
+ SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv);
if (_mesa_is_desktop_gl(ctx)) {
- SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
+ SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv);
SET_QueryCounter(disp, _mesa_QueryCounter);
- SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
- SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
+ SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v);
+ SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v);
SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed);
SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed);
diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h
index f9e916cda..78cbfc294 100644
--- a/mesalib/src/mesa/main/queryobj.h
+++ b/mesalib/src/mesa/main/queryobj.h
@@ -54,33 +54,33 @@ extern void
_mesa_free_queryobj_data(struct gl_context *ctx);
void GLAPIENTRY
-_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
+_mesa_GenQueries(GLsizei n, GLuint *ids);
void GLAPIENTRY
-_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
+_mesa_DeleteQueries(GLsizei n, const GLuint *ids);
GLboolean GLAPIENTRY
-_mesa_IsQueryARB(GLuint id);
+_mesa_IsQuery(GLuint id);
void GLAPIENTRY
_mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id);
void GLAPIENTRY
_mesa_EndQueryIndexed(GLenum target, GLuint index);
void GLAPIENTRY
-_mesa_BeginQueryARB(GLenum target, GLuint id);
+_mesa_BeginQuery(GLenum target, GLuint id);
void GLAPIENTRY
-_mesa_EndQueryARB(GLenum target);
+_mesa_EndQuery(GLenum target);
void GLAPIENTRY
_mesa_QueryCounter(GLuint id, GLenum target);
void GLAPIENTRY
_mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
GLint *params);
void GLAPIENTRY
-_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
+_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params);
void GLAPIENTRY
-_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
+_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
void GLAPIENTRY
-_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
+_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
void GLAPIENTRY
-_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params);
+_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params);
void GLAPIENTRY
-_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params);
+_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params);
#endif /* QUERYOBJ_H */
diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c
index 0ea95b594..51747acab 100644
--- a/mesalib/src/mesa/main/rastpos.c
+++ b/mesalib/src/mesa/main/rastpos.c
@@ -289,49 +289,49 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
+_mesa_WindowPos2d(GLdouble x, GLdouble y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
+_mesa_WindowPos2f(GLfloat x, GLfloat y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y)
+_mesa_WindowPos2i(GLint x, GLint y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y)
+_mesa_WindowPos2s(GLshort x, GLshort y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
+_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
+_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z)
{
window_pos4f(x, y, z, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
+_mesa_WindowPos3i(GLint x, GLint y, GLint z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
+_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z)
{
window_pos4f(x, y, z, 1.0F);
}
@@ -361,49 +361,49 @@ _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
}
void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v)
+_mesa_WindowPos2dv(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v)
+_mesa_WindowPos2fv(const GLfloat *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v)
+_mesa_WindowPos2iv(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v)
+_mesa_WindowPos2sv(const GLshort *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v)
+_mesa_WindowPos3dv(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v)
+_mesa_WindowPos3fv(const GLfloat *v)
{
window_pos4f(v[0], v[1], v[2], 1.0);
}
void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v)
+_mesa_WindowPos3iv(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v)
+_mesa_WindowPos3sv(const GLshort *v)
{
window_pos4f(v[0], v[1], v[2], 1.0F);
}
diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h
index 90351e86b..bbd32abd3 100644
--- a/mesalib/src/mesa/main/rastpos.h
+++ b/mesalib/src/mesa/main/rastpos.h
@@ -90,21 +90,21 @@ _mesa_RasterPos4iv(const GLint *v);
void GLAPIENTRY
_mesa_RasterPos4sv(const GLshort *v);
void GLAPIENTRY
-_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
+_mesa_WindowPos2d(GLdouble x, GLdouble y);
void GLAPIENTRY
-_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
+_mesa_WindowPos2f(GLfloat x, GLfloat y);
void GLAPIENTRY
-_mesa_WindowPos2iMESA(GLint x, GLint y);
+_mesa_WindowPos2i(GLint x, GLint y);
void GLAPIENTRY
-_mesa_WindowPos2sMESA(GLshort x, GLshort y);
+_mesa_WindowPos2s(GLshort x, GLshort y);
void GLAPIENTRY
-_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
+_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
-_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
+_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z);
void GLAPIENTRY
-_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
+_mesa_WindowPos3i(GLint x, GLint y, GLint z);
void GLAPIENTRY
-_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
+_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
void GLAPIENTRY
@@ -114,21 +114,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
void GLAPIENTRY
_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
void GLAPIENTRY
-_mesa_WindowPos2dvMESA(const GLdouble *v);
+_mesa_WindowPos2dv(const GLdouble *v);
void GLAPIENTRY
-_mesa_WindowPos2fvMESA(const GLfloat *v);
+_mesa_WindowPos2fv(const GLfloat *v);
void GLAPIENTRY
-_mesa_WindowPos2ivMESA(const GLint *v);
+_mesa_WindowPos2iv(const GLint *v);
void GLAPIENTRY
-_mesa_WindowPos2svMESA(const GLshort *v);
+_mesa_WindowPos2sv(const GLshort *v);
void GLAPIENTRY
-_mesa_WindowPos3dvMESA(const GLdouble *v);
+_mesa_WindowPos3dv(const GLdouble *v);
void GLAPIENTRY
-_mesa_WindowPos3fvMESA(const GLfloat *v);
+_mesa_WindowPos3fv(const GLfloat *v);
void GLAPIENTRY
-_mesa_WindowPos3ivMESA(const GLint *v);
+_mesa_WindowPos3iv(const GLint *v);
void GLAPIENTRY
-_mesa_WindowPos3svMESA(const GLshort *v);
+_mesa_WindowPos3sv(const GLshort *v);
void GLAPIENTRY
_mesa_WindowPos4dvMESA(const GLdouble *v);
void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c
index f6680c91f..d6d105bc4 100644
--- a/mesalib/src/mesa/main/readpix.c
+++ b/mesalib/src/mesa/main/readpix.c
@@ -743,6 +743,17 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height,
return;
}
+ if (_mesa_is_user_fbo(ctx->ReadBuffer) &&
+ ctx->ReadBuffer->Visual.samples > 0) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)");
+ return;
+ }
+
+ if (!_mesa_source_buffer_exists(ctx, format)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
+ return;
+ }
+
/* Check that the destination format and source buffer are both
* integer-valued or both non-integer-valued.
*/
@@ -757,17 +768,6 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height,
}
}
- if (_mesa_is_user_fbo(ctx->ReadBuffer) &&
- ctx->ReadBuffer->Visual.samples > 0) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)");
- return;
- }
-
- if (!_mesa_source_buffer_exists(ctx, format)) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)");
- return;
- }
-
if (width == 0 || height == 0)
return; /* nothing to do */
diff --git a/mesalib/src/mesa/main/shader_query.cpp b/mesalib/src/mesa/main/shader_query.cpp
index 02a48ba60..27b1b8f56 100644
--- a/mesalib/src/mesa/main/shader_query.cpp
+++ b/mesalib/src/mesa/main/shader_query.cpp
@@ -40,7 +40,7 @@ extern "C" {
}
void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
+_mesa_BindAttribLocation(GLhandleARB program, GLuint index,
const GLcharARB *name)
{
GET_CURRENT_CONTEXT(ctx);
@@ -77,7 +77,7 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
}
void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
+_mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
GLsizei maxLength, GLsizei * length, GLint * size,
GLenum * type, GLcharARB * name)
{
@@ -132,7 +132,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
}
GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
+_mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *const shProg =
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 9376b0f42..727115015 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1001,7 +1001,7 @@ _mesa_AttachShader(GLuint program, GLuint shader)
void GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB shaderObj)
+_mesa_CompileShader(GLhandleARB shaderObj)
{
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
@@ -1215,7 +1215,7 @@ _mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
+_mesa_GetShaderSource(GLhandleARB shader, GLsizei maxLength,
GLsizei *length, GLcharARB *sourceOut)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1248,7 +1248,7 @@ _mesa_IsShader(GLuint name)
void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj)
+_mesa_LinkProgram(GLhandleARB programObj)
{
GET_CURRENT_CONTEXT(ctx);
link_program(ctx, programObj);
@@ -1291,8 +1291,8 @@ read_shader(const char *fname)
* and pass it to _mesa_shader_source().
*/
void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
- const GLcharARB ** string, const GLint * length)
+_mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count,
+ const GLcharARB * const * string, const GLint * length)
{
GET_CURRENT_CONTEXT(ctx);
GLint *offsets;
@@ -1385,7 +1385,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB program)
+_mesa_UseProgram(GLhandleARB program)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *shProg;
@@ -1425,7 +1425,7 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB program)
+_mesa_ValidateProgram(GLhandleARB program)
{
GET_CURRENT_CONTEXT(ctx);
validate_program(ctx, program);
@@ -1706,12 +1706,12 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
}
if (ctx->API != API_OPENGLES) {
- SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
- SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
- SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
- SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
- SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
- SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
+ SET_ShaderSource(exec, _mesa_ShaderSource);
+ SET_CompileShader(exec, _mesa_CompileShader);
+ SET_LinkProgram(exec, _mesa_LinkProgram);
+ SET_UseProgram(exec, _mesa_UseProgram);
+ SET_ValidateProgram(exec, _mesa_ValidateProgram);
+ SET_GetShaderSource(exec, _mesa_GetShaderSource);
/* OpenGL 2.0 */
SET_AttachShader(exec, _mesa_AttachShader);
@@ -1729,9 +1729,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
SET_IsShader(exec, _mesa_IsShader);
/* GL_ARB_vertex_shader */
- SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
- SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
- SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
+ SET_BindAttribLocation(exec, _mesa_BindAttribLocation);
+ SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib);
+ SET_GetAttribLocation(exec, _mesa_GetAttribLocation);
}
if (ctx->API == API_OPENGL) {
@@ -1742,10 +1742,10 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
/* GL_EXT_gpu_shader4 / GL 3.0 */
if (_mesa_is_desktop_gl(ctx)) {
- SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation);
+ SET_BindFragDataLocation(exec, _mesa_BindFragDataLocation);
}
if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
- SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation);
+ SET_GetFragDataLocation(exec, _mesa_GetFragDataLocation);
}
/* GL_ARB_ES2_compatibility */
diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h
index d6382e04a..8ee68d82d 100644
--- a/mesalib/src/mesa/main/shaderapi.h
+++ b/mesalib/src/mesa/main/shaderapi.h
@@ -64,7 +64,7 @@ extern void GLAPIENTRY
_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
extern void GLAPIENTRY
-_mesa_CompileShaderARB(GLhandleARB);
+_mesa_CompileShader(GLhandleARB);
extern GLhandleARB GLAPIENTRY
_mesa_CreateProgramObjectARB(void);
@@ -100,7 +100,7 @@ extern void GLAPIENTRY
_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
extern void GLAPIENTRY
-_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
extern GLboolean GLAPIENTRY
_mesa_IsProgram(GLuint name);
@@ -109,20 +109,20 @@ extern GLboolean GLAPIENTRY
_mesa_IsShader(GLuint name);
extern void GLAPIENTRY
-_mesa_LinkProgramARB(GLhandleARB programObj);
+_mesa_LinkProgram(GLhandleARB programObj);
extern void GLAPIENTRY
-_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* const *, const GLint *);
extern void GLAPIENTRY
-_mesa_UseProgramObjectARB(GLhandleARB);
+_mesa_UseProgram(GLhandleARB);
extern void GLAPIENTRY
-_mesa_ValidateProgramARB(GLhandleARB);
+_mesa_ValidateProgram(GLhandleARB);
extern void GLAPIENTRY
-_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);
+_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *);
extern void GLAPIENTRY
_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,
@@ -133,11 +133,11 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name);
extern void GLAPIENTRY
-_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
+_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
GLenum *, GLcharARB *);
extern GLint GLAPIENTRY
-_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);
+_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *);
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c
index 8927f46b0..847612c3b 100644
--- a/mesalib/src/mesa/main/syncobj.c
+++ b/mesalib/src/mesa/main/syncobj.c
@@ -308,7 +308,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
}
if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags);
+ _mesa_error(ctx, GL_INVALID_VALUE, "glClientWaitSync(flags=0x%x)", flags);
return GL_WAIT_FAILED;
}
@@ -352,15 +352,12 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
}
if (flags != 0) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags);
+ _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(flags=0x%x)", flags);
return;
}
- /* From the GL_ARB_sync spec:
- *
- * If the value of <timeout> is zero, then WaitSync does nothing.
- */
- if (timeout == 0) {
+ if (timeout != GL_TIMEOUT_IGNORED) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout);
return;
}
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 554c68b71..2ccdcebd9 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -959,7 +959,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
}
void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
+_mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
{
_mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img);
}
diff --git a/mesalib/src/mesa/main/texgetimage.h b/mesalib/src/mesa/main/texgetimage.h
index cd8e76e7a..c9277fc91 100644
--- a/mesalib/src/mesa/main/texgetimage.h
+++ b/mesalib/src/mesa/main/texgetimage.h
@@ -54,7 +54,7 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format,
GLenum type, GLsizei bufSize, GLvoid *pixels );
extern void GLAPIENTRY
-_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
+_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img);
extern void GLAPIENTRY
_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 0f28009b0..7d5a574e4 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1027,6 +1027,44 @@ _mesa_get_texture_dimensions(GLenum target)
}
+/**
+ * Return the maximum number of mipmap levels for the given target
+ * and the dimensions.
+ * The dimensions are expected not to include the border.
+ */
+GLsizei
+_mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height,
+ GLsizei depth)
+{
+ GLsizei size;
+
+ switch (target) {
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_1D_ARRAY:
+ size = width;
+ break;
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
+ ASSERT(width == height);
+ size = width;
+ break;
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_2D_ARRAY:
+ size = MAX2(width, height);
+ break;
+ case GL_TEXTURE_3D:
+ size = MAX3(width, height, depth);
+ break;
+ case GL_TEXTURE_RECTANGLE:
+ case GL_TEXTURE_EXTERNAL_OES:
+ return 1;
+ default:
+ assert(0);
+ return 1;
+ }
+
+ return _mesa_logbase2(size) + 1;
+}
#if 000 /* not used anymore */
@@ -1214,7 +1252,9 @@ _mesa_init_teximage_fields(struct gl_context *ctx,
target);
}
- img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2);
+ img->MaxNumLevels =
+ _mesa_get_tex_max_num_levels(target,
+ img->Width2, img->Height2, img->Depth2);
img->TexFormat = format;
}
@@ -3532,7 +3572,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage1D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLint border, GLsizei imageSize,
const GLvoid *data)
@@ -3544,7 +3584,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage2D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
const GLvoid *data)
@@ -3556,7 +3596,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage3D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize, const GLvoid *data)
@@ -3611,7 +3651,7 @@ compressed_tex_sub_image(GLuint dims, GLenum target, GLint level,
void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data)
{
@@ -3621,7 +3661,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data)
@@ -3632,7 +3672,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data)
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index e1b15d252..65e933371 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -138,6 +138,9 @@ _mesa_tex_target_to_face(GLenum target);
extern GLint
_mesa_get_texture_dimensions(GLenum target);
+extern GLsizei
+_mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height,
+ GLsizei depth);
extern GLboolean
_mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
@@ -248,41 +251,36 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
extern void GLAPIENTRY
-_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage1D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLint border, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
-_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage2D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
-_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
+_mesa_CompressedTexImage3D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize, const GLvoid *data);
-#ifdef VMS
-#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
-#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
-#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
-#endif
extern void GLAPIENTRY
-_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data);
extern void GLAPIENTRY
-_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
-_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
+_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data);
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index c083c72e2..d650c75e4 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -445,7 +445,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
{
const GLint baseLevel = t->BaseLevel;
const struct gl_texture_image *baseImage;
- GLint maxLog2 = 0, maxLevels = 0;
+ GLint maxLevels = 0;
/* We'll set these to FALSE if tests fail below */
t->_BaseComplete = GL_TRUE;
@@ -501,31 +501,22 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
switch (t->Target) {
case GL_TEXTURE_1D:
case GL_TEXTURE_1D_ARRAY_EXT:
- maxLog2 = baseImage->WidthLog2;
maxLevels = ctx->Const.MaxTextureLevels;
break;
case GL_TEXTURE_2D:
case GL_TEXTURE_2D_ARRAY_EXT:
- maxLog2 = MAX2(baseImage->WidthLog2,
- baseImage->HeightLog2);
maxLevels = ctx->Const.MaxTextureLevels;
break;
case GL_TEXTURE_3D:
- maxLog2 = MAX3(baseImage->WidthLog2,
- baseImage->HeightLog2,
- baseImage->DepthLog2);
maxLevels = ctx->Const.Max3DTextureLevels;
break;
case GL_TEXTURE_CUBE_MAP_ARB:
case GL_TEXTURE_CUBE_MAP_ARRAY:
- maxLog2 = MAX2(baseImage->WidthLog2,
- baseImage->HeightLog2);
maxLevels = ctx->Const.MaxCubeTextureLevels;
break;
case GL_TEXTURE_RECTANGLE_NV:
case GL_TEXTURE_BUFFER:
case GL_TEXTURE_EXTERNAL_OES:
- maxLog2 = 0; /* not applicable */
maxLevels = 1; /* no mipmapping */
break;
default:
@@ -535,7 +526,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
ASSERT(maxLevels > 0);
- t->_MaxLevel = baseLevel + maxLog2; /* 'p' in the GL spec */
+ t->_MaxLevel =
+ baseLevel + baseImage->MaxNumLevels - 1; /* 'p' in the GL spec */
t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel);
t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1); /* 'q' in the GL spec */
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index 1f765086b..8e9bbf6a1 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -286,7 +286,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
/* GL_ARB_multitexture */
void GLAPIENTRY
-_mesa_ActiveTextureARB(GLenum texture)
+_mesa_ActiveTexture(GLenum texture)
{
const GLuint texUnit = texture - GL_TEXTURE0;
GLuint k;
@@ -325,7 +325,7 @@ _mesa_ActiveTextureARB(GLenum texture)
/* GL_ARB_multitexture */
void GLAPIENTRY
-_mesa_ClientActiveTextureARB(GLenum texture)
+_mesa_ClientActiveTexture(GLenum texture)
{
GET_CURRENT_CONTEXT(ctx);
GLuint texUnit = texture - GL_TEXTURE0;
diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h
index 7dc6dc6a2..7abf9101e 100644
--- a/mesalib/src/mesa/main/texstate.h
+++ b/mesalib/src/mesa/main/texstate.h
@@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
/*@{*/
extern void GLAPIENTRY
-_mesa_ActiveTextureARB( GLenum target );
+_mesa_ActiveTexture( GLenum target );
extern void GLAPIENTRY
-_mesa_ClientActiveTextureARB( GLenum target );
+_mesa_ClientActiveTexture( GLenum target );
/*@}*/
diff --git a/mesalib/src/mesa/main/texstorage.c b/mesalib/src/mesa/main/texstorage.c
index 9e0b54317..00f19bae5 100644
--- a/mesalib/src/mesa/main/texstorage.c
+++ b/mesalib/src/mesa/main/texstorage.c
@@ -214,7 +214,6 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
GLsizei width, GLsizei height, GLsizei depth)
{
struct gl_texture_object *texObj;
- GLuint maxDim;
GLboolean legalFormat;
/* check internal format - note that only sized formats are allowed */
@@ -294,8 +293,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
}
/* check levels against width/height/depth */
- maxDim = MAX3(width, height, depth);
- if (levels > (GLint) _mesa_logbase2(maxDim) + 1) {
+ if (levels > _mesa_get_tex_max_num_levels(target, width, height, depth)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glTexStorage%uD(too many levels for max texture dimension)",
dims);
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c
index 52cb065c2..e0dd4e886 100644
--- a/mesalib/src/mesa/main/transformfeedback.c
+++ b/mesalib/src/mesa/main/transformfeedback.c
@@ -512,7 +512,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
*/
void GLAPIENTRY
_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
- const GLchar **varyings, GLenum bufferMode)
+ const GLchar * const *varyings,
+ GLenum bufferMode)
{
struct gl_shader_program *shProg;
GLint i;
diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h
index dec11ffa0..01c2af359 100644
--- a/mesalib/src/mesa/main/transformfeedback.h
+++ b/mesalib/src/mesa/main/transformfeedback.h
@@ -73,7 +73,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
extern void GLAPIENTRY
_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
- const GLchar **varyings, GLenum bufferMode);
+ const GLchar * const *varyings,
+ GLenum bufferMode);
extern void GLAPIENTRY
_mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index bddb8f95e..c71577c6e 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -38,7 +38,7 @@
extern "C" void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
+_mesa_GetActiveUniform(GLhandleARB program, GLuint index,
GLsizei maxLength, GLsizei *length, GLint *size,
GLenum *type, GLcharARB *nameOut)
{
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index 2b7a564f0..3f156bf10 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -128,14 +128,14 @@ _mesa_uniform_detach_all_driver_storage(struct gl_uniform_storage *uni)
}
void GLAPIENTRY
-_mesa_Uniform1fARB(GLint location, GLfloat v0)
+_mesa_Uniform1f(GLint location, GLfloat v0)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT);
}
void GLAPIENTRY
-_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
+_mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1)
{
GET_CURRENT_CONTEXT(ctx);
GLfloat v[2];
@@ -145,7 +145,7 @@ _mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
}
void GLAPIENTRY
-_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
+_mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
{
GET_CURRENT_CONTEXT(ctx);
GLfloat v[3];
@@ -156,7 +156,7 @@ _mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
}
void GLAPIENTRY
-_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
+_mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
GLfloat v3)
{
GET_CURRENT_CONTEXT(ctx);
@@ -169,14 +169,14 @@ _mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
}
void GLAPIENTRY
-_mesa_Uniform1iARB(GLint location, GLint v0)
+_mesa_Uniform1i(GLint location, GLint v0)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT);
}
void GLAPIENTRY
-_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
+_mesa_Uniform2i(GLint location, GLint v0, GLint v1)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[2];
@@ -186,7 +186,7 @@ _mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
}
void GLAPIENTRY
-_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
+_mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[3];
@@ -197,7 +197,7 @@ _mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
}
void GLAPIENTRY
-_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
+_mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[4];
@@ -209,56 +209,56 @@ _mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
}
void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT);
}
void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2);
}
void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3);
}
void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
+_mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4);
}
void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT);
}
void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2);
}
void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3);
}
void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
+_mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4);
@@ -337,7 +337,7 @@ _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@@ -346,7 +346,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
}
void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@@ -355,7 +355,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
}
void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
+_mesa_UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@@ -431,7 +431,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location,
}
void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)
+_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params)
{
_mesa_GetnUniformfvARB(program, location, INT_MAX, params);
}
@@ -446,7 +446,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location,
}
void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)
+_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params)
{
_mesa_GetnUniformivARB(program, location, INT_MAX, params);
}
@@ -495,7 +495,7 @@ _mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params)
GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
+_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
{
struct gl_shader_program *shProg;
GLuint index, offset;
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
index 076bde3c8..287d7106b 100644
--- a/mesalib/src/mesa/main/uniforms.h
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -39,37 +39,37 @@ struct gl_program;
struct _glapi_table;
void GLAPIENTRY
-_mesa_Uniform1fARB(GLint, GLfloat);
+_mesa_Uniform1f(GLint, GLfloat);
void GLAPIENTRY
-_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
+_mesa_Uniform2f(GLint, GLfloat, GLfloat);
void GLAPIENTRY
-_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
+_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat);
void GLAPIENTRY
-_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
void GLAPIENTRY
-_mesa_Uniform1iARB(GLint, GLint);
+_mesa_Uniform1i(GLint, GLint);
void GLAPIENTRY
-_mesa_Uniform2iARB(GLint, GLint, GLint);
+_mesa_Uniform2i(GLint, GLint, GLint);
void GLAPIENTRY
-_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
+_mesa_Uniform3i(GLint, GLint, GLint, GLint);
void GLAPIENTRY
-_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
+_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint);
void GLAPIENTRY
-_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
-_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
-_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
-_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
+_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
-_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform1iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
-_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform2iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
-_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform3iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
-_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
+_mesa_Uniform4iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
_mesa_Uniform1ui(GLint location, GLuint v0);
void GLAPIENTRY
@@ -87,11 +87,11 @@ _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
void GLAPIENTRY
_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
void GLAPIENTRY
-_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
-_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
-_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
+_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value);
@@ -113,7 +113,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
void GLAPIENTRY
_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *);
void GLAPIENTRY
-_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
+_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *);
void GLAPIENTRY
_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *);
void GLAPIENTRY
@@ -127,7 +127,7 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
void GLAPIENTRY
_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *);
GLint GLAPIENTRY
-_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
+_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *);
GLuint GLAPIENTRY
_mesa_GetUniformBlockIndex(GLuint program,
const GLchar *uniformBlockName);
@@ -156,7 +156,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex,
GLsizei bufSize, GLsizei *length,
GLchar *uniformName);
void GLAPIENTRY
-_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
+_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *,
GLint *, GLenum *, GLcharARB *);
void GLAPIENTRY
_mesa_GetActiveUniformsiv(GLuint program,
@@ -165,7 +165,7 @@ _mesa_GetActiveUniformsiv(GLuint program,
GLenum pname,
GLint *params);
void GLAPIENTRY
-_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
+_mesa_GetUniformiv(GLhandleARB, GLint, GLint *);
unsigned
_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index 3974787b4..f77014397 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -330,7 +330,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
+_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT);
GET_CURRENT_CONTEXT(ctx);
@@ -357,7 +357,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+_mesa_SecondaryColorPointer(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
@@ -413,7 +413,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
+_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
@@ -437,7 +437,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
* (position, normal, color, fog, texcoord, etc).
*/
void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
GLboolean normalized,
GLsizei stride, const GLvoid *ptr)
{
@@ -493,7 +493,7 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index)
+_mesa_EnableVertexAttribArray(GLuint index)
{
struct gl_array_object *arrayObj;
GET_CURRENT_CONTEXT(ctx);
@@ -520,7 +520,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index)
void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index)
+_mesa_DisableVertexAttribArray(GLuint index)
{
struct gl_array_object *arrayObj;
GET_CURRENT_CONTEXT(ctx);
@@ -630,7 +630,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function)
}
void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
+_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -649,7 +649,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
+_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -671,7 +671,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
+_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -736,7 +736,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
+_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1039,7 +1039,7 @@ _mesa_UnlockArraysEXT( void )
/* GL_EXT_multi_draw_arrays */
void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
const GLsizei *count, GLsizei primcount )
{
GET_CURRENT_CONTEXT(ctx);
@@ -1137,7 +1137,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
}
if (index >= ctx->Const.VertexProgram.MaxAttribs) {
- _mesa_error(ctx, GL_INVALID_ENUM, "glVertexAttribDivisor(index = %u)",
+ _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribDivisor(index = %u)",
index);
return;
}
diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h
index b54e2f7df..904fa1bea 100644
--- a/mesalib/src/mesa/main/varray.h
+++ b/mesalib/src/mesa/main/varray.h
@@ -127,20 +127,20 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
extern void GLAPIENTRY
-_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
+_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
-_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
+_mesa_SecondaryColorPointer(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
-_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
+_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
+_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
GLboolean normalized, GLsizei stride,
const GLvoid *pointer);
@@ -150,23 +150,23 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
extern void GLAPIENTRY
-_mesa_EnableVertexAttribArrayARB(GLuint index);
+_mesa_EnableVertexAttribArray(GLuint index);
extern void GLAPIENTRY
-_mesa_DisableVertexAttribArrayARB(GLuint index);
+_mesa_DisableVertexAttribArray(GLuint index);
extern void GLAPIENTRY
-_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
+_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);
extern void GLAPIENTRY
-_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
+_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
extern void GLAPIENTRY
-_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
+_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
extern void GLAPIENTRY
@@ -178,7 +178,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
extern void GLAPIENTRY
-_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
+_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer);
extern void GLAPIENTRY
@@ -186,7 +186,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
extern void GLAPIENTRY
-_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
+_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
const GLsizei *count, GLsizei primcount );
extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/vsnprintf.c b/mesalib/src/mesa/main/vsnprintf.c
deleted file mode 100644
index 3bbc0a9e2..000000000
--- a/mesalib/src/mesa/main/vsnprintf.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Revision 12: http://theos.com/~deraadt/snprintf.c
- *
- * Copyright (c) 1997 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __VMS
-# include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <stdio.h>
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#include <setjmp.h>
-#include <unistd.h>
-#include <string.h>
-
-#ifndef roundup
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-#endif
-
-#ifdef __sgi
-#define size_t ssize_t
-#endif
-
-static int pgsize;
-static char *curobj;
-static int caught;
-static sigjmp_buf bail;
-
-#define EXTRABYTES 2 /* XXX: why 2? you don't want to know */
-
-static char *
-msetup(str, n)
- char *str;
- size_t n;
-{
- char *e;
-
- if (n == 0)
- return NULL;
- if (pgsize == 0)
- pgsize = getpagesize();
- curobj = malloc(n + EXTRABYTES + pgsize * 2);
- if (curobj == NULL)
- return NULL;
- e = curobj + n + EXTRABYTES;
- e = (char *)roundup((unsigned long)e, pgsize);
- if (mprotect(e, pgsize, PROT_NONE) == -1) {
- free(curobj);
- curobj = NULL;
- return NULL;
- }
- e = e - n - EXTRABYTES;
- *e = '\0';
- return (e);
-}
-
-static void
- mcatch( int a )
-{
- siglongjmp(bail, 1);
-}
-
-static void
-mcleanup(str, n, p)
- char *str;
- size_t n;
- char *p;
-{
- strncpy(str, p, n-1);
- str[n-1] = '\0';
- if (mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
- PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
- mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
- PROT_READ|PROT_WRITE);
- free(curobj);
-}
-
-int
-#if __STDC__
-vsnprintf(char *str, size_t n, char const *fmt, va_list ap)
-#else
-vsnprintf(str, n, fmt, ap)
- char *str;
- size_t n;
- char *fmt;
- char *ap;
-#endif
-{
- struct sigaction osa, nsa;
- char *p;
- int ret = n + 1; /* if we bail, indicated we overflowed */
-
- memset(&nsa, 0, sizeof nsa);
- nsa.sa_handler = mcatch;
- sigemptyset(&nsa.sa_mask);
-
- p = msetup(str, n);
- if (p == NULL) {
- *str = '\0';
- return 0;
- }
- if (sigsetjmp(bail, 1) == 0) {
- if (sigaction(SIGSEGV, &nsa, &osa) == -1) {
- mcleanup(str, n, p);
- return (0);
- }
- ret = vsprintf(p, fmt, ap);
- }
- mcleanup(str, n, p);
- (void) sigaction(SIGSEGV, &osa, NULL);
- return (ret);
-}
-
-int
-#if __STDC__
-snprintf(char *str, size_t n, char const *fmt, ...)
-#else
-snprintf(str, n, fmt, va_alist)
- char *str;
- size_t n;
- char *fmt;
- va_dcl
-#endif
-{
- va_list ap;
-#if __STDC__
- va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
-
- return (vsnprintf(str, n, fmt, ap));
- va_end(ap);
-}
-
-
-
diff --git a/mesalib/src/mesa/math/descrip.mms b/mesalib/src/mesa/math/descrip.mms
deleted file mode 100644
index 3aaa6eb8b..000000000
--- a/mesalib/src/mesa/math/descrip.mms
+++ /dev/null
@@ -1,47 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 3 October 2007
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define glapi [-.glapi]
- define main [-.main]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\
- m_translate.c m_vector.c m_xform.c
-
-OBJECTS = m_debug_clip.obj,m_debug_norm.obj,m_debug_xform.obj,m_eval.obj,\
- m_matrix.obj,m_translate.obj,m_vector.obj,m_xform.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-m_debug_clip.obj : m_debug_clip.c
-m_debug_norm.obj : m_debug_norm.c
-m_debug_xform.obj : m_debug_xform.c
-m_eval.obj : m_eval.c
-m_matrix.obj : m_matrix.c
-m_translate.obj : m_translate.c
-m_vector.obj : m_vector.c
-m_xform.obj : m_xform.c
diff --git a/mesalib/src/mesa/program/.gitignore b/mesalib/src/mesa/program/.gitignore
index 2f1601fcc..9c23422f3 100644..100755
--- a/mesalib/src/mesa/program/.gitignore
+++ b/mesalib/src/mesa/program/.gitignore
@@ -1,3 +1,4 @@
+/Makefile
lex.yy.c
program_parse.output
program_parse.tab.c
diff --git a/mesalib/src/mesa/program/Android.mk b/mesalib/src/mesa/program/Android.mk
new file mode 100644
index 000000000..5eb043955
--- /dev/null
+++ b/mesalib/src/mesa/program/Android.mk
@@ -0,0 +1,84 @@
+# Copyright 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+LOCAL_PATH := $(call my-dir)
+
+define local-l-to-c
+ @mkdir -p $(dir $@)
+ @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"
+ $(hide) $(LEX) -o$@ $<
+endef
+
+define mesa_local-y-to-c-and-h
+ @mkdir -p $(dir $@)
+ @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
+ $(hide) $(YACC) -o $@ -p "_mesa_program_" $<
+endef
+
+# ----------------------------------------------------------------------
+# libmesa_program.a
+# ----------------------------------------------------------------------
+
+# Import the following variables:
+# PROGRAM_FILES
+include $(MESA_TOP)/src/mesa/sources.mak
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libmesa_program
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+intermediates := $(call local-intermediates-dir)
+
+MESA_ENABLED_APIS := ES1 ES2
+
+# TODO(chadv): In sources.mak, move these vars to a different list so we can
+# remove this kludge.
+generated_sources_basenames := \
+ lex.yy.c \
+ program_parse.tab.c \
+ program_parse.tab.h
+
+LOCAL_SRC_FILES := \
+ $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES)))
+
+LOCAL_GENERATED_SOURCES := \
+ $(addprefix $(intermediates)/program/,$(generated_sources_basenames))
+
+$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y
+ $(mesa_local-y-to-c-and-h)
+
+$(intermediates)/program/program_parse.tab.h: $(LOCAL_PATH)/program_parse.y
+ $(mesa_local-y-to-c-and-h)
+
+$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
+ $(local-l-to-c)
+
+LOCAL_CFLAGS := \
+ $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
+
+LOCAL_C_INCLUDES := \
+ $(intermediates) \
+ $(MESA_TOP)/src/mapi \
+ $(MESA_TOP)/src/mesa \
+ $(MESA_TOP)/src/glsl
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/mesalib/src/mesa/program/Makefile.am b/mesalib/src/mesa/program/Makefile.am
new file mode 100644
index 000000000..ea412f56f
--- /dev/null
+++ b/mesalib/src/mesa/program/Makefile.am
@@ -0,0 +1,57 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+include ../sources.mak
+
+AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
+libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS)
+libdricore_program_la_CXXFLAGS = $(NOVISIBILITY_CXXFLAGS)
+
+SRCDIR = $(top_srcdir)/src/mesa/
+BUILDDIR = $(top_builddir)/src/mesa/
+
+if NEED_LIBDRICORE
+DRICORE_LIB = libdricore_program.la
+endif
+
+noinst_LTLIBRARIES = $(DRICORE_LIB)
+if HAVE_GALLIUM
+noinst_LTLIBRARIES += libprogram.la
+else
+check_LTLIBRARIES = libprogram.la
+endif
+
+libprogram_la_SOURCES = $(PROGRAM_FILES)
+libdricore_program_la_SOURCES = $(PROGRAM_FILES)
+
+lex.yy.c: program_lexer.l
+ $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
+
+program_parse.tab.c program_parse.tab.h: program_parse.y
+ $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program_parse.tab.c $<
+
+BUILT_SOURCES = \
+ program_parse.tab.c \
+ program_parse.tab.h \
+ lex.yy.c
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/mesalib/src/mesa/program/descrip.mms b/mesalib/src/mesa/program/descrip.mms
deleted file mode 100644
index 59730020d..000000000
--- a/mesalib/src/mesa/program/descrip.mms
+++ /dev/null
@@ -1,93 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 29 September 2008
-.first
- define gl [---.include.gl]
- define math [-.math]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
- define glapi [-.glapi]
- define main [-.main]
- define shader [-.shader]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = \
- atifragshader.c \
- arbprogparse.c \
- arbprogram.c \
- nvfragparse.c \
- nvprogram.c \
- nvvertparse.c \
- program.c \
- programopt.c \
- prog_debug.c \
- prog_execute.c \
- prog_instruction.c \
- prog_parameter.c \
- prog_print.c \
- prog_cache.c \
- prog_statevars.c \
- shader_api.c prog_uniform.c
-
-OBJECTS = \
- atifragshader.obj,\
- arbprogparse.obj,\
- arbprogram.obj,\
- nvfragparse.obj,\
- nvprogram.obj,\
- nvvertparse.obj,\
- program.obj,\
- programopt.obj,\
- prog_debug.obj,\
- prog_execute.obj,\
- prog_instruction.obj,\
- prog_parameter.obj,\
- prog_print.obj,\
- prog_statevars.obj,\
- shader_api.obj,prog_uniform.obj,prog_cache.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-all :
- $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB)
- set def [.slang]
- $(MMS)$(MMSQUALIFIERS)
- set def [-]
-
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-atifragshader.obj : atifragshader.c
-arbprogparse.obj : arbprogparse.c
-arbprogram.obj : arbprogram.c
-nvfragparse.obj : nvfragparse.c
-nvprogram.obj : nvprogram.c
-nvvertparse.obj : nvvertparse.c
-program.obj : program.c
-programopt. obj : programopt.c
-prog_debug.obj : prog_debug.c
-prog_execute.obj : prog_execute.c
-prog_instruction.obj : prog_instruction.c
-prog_parameter.obj : prog_parameter.c
-prog_print.obj : prog_print.c
-prog_statevars.obj : prog_statevars.c
-shader_api.obj : shader_api.c
-prog_uniform.obj : prog_uniform.c
-prog_cache.obj : prog_cache.c
diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c
index 9ee2f2014..fe2359bc2 100644
--- a/mesalib/src/mesa/program/prog_execute.c
+++ b/mesalib/src/mesa/program/prog_execute.c
@@ -65,9 +65,6 @@
fi.i = 0xFF800000; \
x = fi.f; \
} while (0)
-#elif defined(VMS)
-#define SET_POS_INFINITY(x) x = __MAXFLOAT
-#define SET_NEG_INFINITY(x) x = -__MAXFLOAT
#else
#define SET_POS_INFINITY(x) x = (GLfloat) HUGE_VAL
#define SET_NEG_INFINITY(x) x = (GLfloat) -HUGE_VAL
@@ -1027,15 +1024,7 @@ _mesa_execute_program(struct gl_context * ctx,
fetch_vector1(&inst->SrcReg[0], machine, t);
abs_t0 = FABSF(t[0]);
if (abs_t0 != 0.0F) {
- /* Since we really can't handle infinite values on VMS
- * like other OSes we'll use __MAXFLOAT to represent
- * infinity. This may need some tweaking.
- */
-#ifdef VMS
- if (abs_t0 == __MAXFLOAT)
-#else
if (IS_INF_OR_NAN(abs_t0))
-#endif
{
SET_POS_INFINITY(q[0]);
q[1] = 1.0F;
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index cfb24f318..54e58c21b 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -40,6 +40,7 @@ MAIN_FILES = \
$(SRCDIR)main/fbobject.c \
$(SRCDIR)main/feedback.c \
$(SRCDIR)main/ffvertex_prog.c \
+ $(SRCDIR)main/ff_fragment_shader.cpp \
$(SRCDIR)main/fog.c \
$(SRCDIR)main/formats.c \
$(SRCDIR)main/format_pack.c \
@@ -49,6 +50,7 @@ MAIN_FILES = \
$(SRCDIR)main/getstring.c \
$(SRCDIR)main/glformats.c \
$(SRCDIR)main/hash.c \
+ $(SRCDIR)main/hash_table.c \
$(SRCDIR)main/hint.c \
$(SRCDIR)main/histogram.c \
$(SRCDIR)main/image.c \
@@ -76,6 +78,7 @@ MAIN_FILES = \
$(SRCDIR)main/scissor.c \
$(SRCDIR)main/shaderapi.c \
$(SRCDIR)main/shaderobj.c \
+ $(SRCDIR)main/shader_query.cpp \
$(SRCDIR)main/shared.c \
$(SRCDIR)main/state.c \
$(SRCDIR)main/stencil.c \
@@ -99,6 +102,7 @@ MAIN_FILES = \
$(SRCDIR)main/texturebarrier.c \
$(SRCDIR)main/transformfeedback.c \
$(SRCDIR)main/uniforms.c \
+ $(SRCDIR)main/uniform_query.cpp \
$(SRCDIR)main/varray.c \
$(SRCDIR)main/version.c \
$(SRCDIR)main/viewport.c \
@@ -106,11 +110,6 @@ MAIN_FILES = \
$(BUILDDIR)main/enums.c \
$(MAIN_ES_FILES)
-MAIN_CXX_FILES = \
- $(SRCDIR)main/ff_fragment_shader.cpp \
- $(SRCDIR)main/shader_query.cpp \
- $(SRCDIR)main/uniform_query.cpp
-
MATH_FILES = \
$(SRCDIR)math/m_debug_clip.c \
$(SRCDIR)math/m_debug_norm.c \
@@ -240,6 +239,7 @@ STATETRACKER_FILES = \
$(SRCDIR)state_tracker/st_extensions.c \
$(SRCDIR)state_tracker/st_format.c \
$(SRCDIR)state_tracker/st_gen_mipmap.c \
+ $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \
$(SRCDIR)state_tracker/st_manager.c \
$(SRCDIR)state_tracker/st_mesa_to_tgsi.c \
$(SRCDIR)state_tracker/st_program.c \
@@ -248,6 +248,7 @@ STATETRACKER_FILES = \
PROGRAM_FILES = \
$(SRCDIR)program/arbprogparse.c \
$(SRCDIR)program/hash_table.c \
+ $(SRCDIR)program/ir_to_mesa.cpp \
$(SRCDIR)program/program.c \
$(SRCDIR)program/program_parse_extra.c \
$(SRCDIR)program/prog_cache.c \
@@ -262,16 +263,12 @@ PROGRAM_FILES = \
$(SRCDIR)program/prog_statevars.c \
$(SRCDIR)program/programopt.c \
$(SRCDIR)program/register_allocate.c \
+ $(SRCDIR)program/sampler.cpp \
+ $(SRCDIR)program/string_to_uint_map.cpp \
$(SRCDIR)program/symbol_table.c \
$(BUILDDIR)program/lex.yy.c \
$(BUILDDIR)program/program_parse.tab.c
-
-SHADER_CXX_FILES = \
- $(SRCDIR)program/ir_to_mesa.cpp \
- $(SRCDIR)program/sampler.cpp \
- $(SRCDIR)program/string_to_uint_map.cpp
-
ASM_C_FILES = \
$(SRCDIR)x86/common_x86.c \
$(SRCDIR)x86/x86_xform.c \
@@ -320,53 +317,25 @@ MESA_FILES = \
$(MATH_XFORM_FILES) \
$(VBO_FILES) \
$(TNL_FILES) \
- $(PROGRAM_FILES) \
$(SWRAST_FILES) \
$(SWRAST_SETUP_FILES) \
$(COMMON_DRIVER_FILES)\
$(ASM_C_FILES)
-MESA_CXX_FILES = \
- $(MAIN_CXX_FILES) \
- $(SHADER_CXX_FILES)
-
# Sources for building Gallium drivers
MESA_GALLIUM_FILES = \
$(MAIN_FILES) \
$(MATH_FILES) \
$(VBO_FILES) \
$(STATETRACKER_FILES) \
- $(PROGRAM_FILES) \
$(SRCDIR)x86/common_x86.c
-MESA_GALLIUM_CXX_FILES = \
- $(MESA_CXX_FILES) \
- $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp
-
# All the core C sources, for dependency checking
ALL_FILES = \
$(MESA_FILES) \
- $(MESA_GALLIUM_CXX_FILES) \
$(MESA_ASM_FILES) \
$(STATETRACKER_FILES)
-
-### Object files
-
-MESA_OBJECTS = \
- $(MESA_FILES:.c=.o) \
- $(MESA_CXX_FILES:.cpp=.o) \
- $(MESA_ASM_FILES:.S=.o)
-
-MESA_GALLIUM_OBJECTS = \
- $(MESA_GALLIUM_FILES:.c=.o) \
- $(MESA_GALLIUM_CXX_FILES:.cpp=.o) \
- $(MESA_ASM_FILES:.S=.o)
-
-
-COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_FILES:.c=.o)
-
-
### Include directories
INCLUDE_DIRS = \
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index b2711c342..f06814f9c 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -253,37 +253,6 @@ default_bindings(struct st_context *st, enum pipe_format format)
}
-/** Return number of image dimensions (1, 2 or 3) for a texture target. */
-static GLuint
-get_texture_dims(GLenum target)
-{
- switch (target) {
- case GL_TEXTURE_1D:
- case GL_TEXTURE_1D_ARRAY_EXT:
- case GL_TEXTURE_BUFFER:
- return 1;
- case GL_TEXTURE_2D:
- case GL_TEXTURE_CUBE_MAP_ARB:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
- case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
- case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
- case GL_TEXTURE_RECTANGLE_NV:
- case GL_TEXTURE_2D_ARRAY_EXT:
- case GL_TEXTURE_EXTERNAL_OES:
- return 2;
- case GL_TEXTURE_3D:
- case GL_TEXTURE_CUBE_MAP_ARRAY:
- return 3;
- default:
- assert(0 && "invalid texture target in get_texture_dims()");
- return 1;
- }
-}
-
-
/**
* Given the size of a mipmap image, try to compute the size of the level=0
* mipmap image.
@@ -298,32 +267,57 @@ guess_base_level_size(GLenum target,
GLuint width, GLuint height, GLuint depth, GLuint level,
GLuint *width0, GLuint *height0, GLuint *depth0)
{
- const GLuint dims = get_texture_dims(target);
-
assert(width >= 1);
assert(height >= 1);
assert(depth >= 1);
if (level > 0) {
- /* Depending on the image's size, we can't always make a guess here */
- if ((dims >= 1 && width == 1) ||
- (dims >= 2 && height == 1) ||
- (dims >= 3 && depth == 1)) {
- /* we can't determine the image size at level=0 */
- return GL_FALSE;
- }
+ /* Guess the size of the base level.
+ * Depending on the image's size, we can't always make a guess here.
+ */
+ switch (target) {
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_1D_ARRAY:
+ width <<= level;
+ break;
+
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_2D_ARRAY:
+ /* We can't make a good guess here, because the base level dimensions
+ * can be non-square.
+ */
+ if (width == 1 || height == 1) {
+ return GL_FALSE;
+ }
+ width <<= level;
+ height <<= level;
+ break;
+
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
+ width <<= level;
+ height <<= level;
+ break;
+
+ case GL_TEXTURE_3D:
+ /* We can't make a good guess here, because the base level dimensions
+ * can be non-cube.
+ */
+ if (width == 1 || height == 1 || depth == 1) {
+ return GL_FALSE;
+ }
+ width <<= level;
+ height <<= level;
+ depth <<= level;
+ break;
+
+ case GL_TEXTURE_RECTANGLE:
+ break;
- /* grow the image size until we hit level = 0 */
- while (level > 0) {
- if (width > 1)
- width <<= 1;
- if (height > 1)
- height <<= 1;
- if (depth > 1)
- depth <<= 1;
- level--;
+ default:
+ assert(0);
}
- }
+ }
*width0 = width;
*height0 = height;
@@ -390,10 +384,8 @@ guess_and_alloc_texture(struct st_context *st,
}
else {
/* alloc space for a full mipmap */
- GLuint l2width = util_logbase2(width);
- GLuint l2height = util_logbase2(height);
- GLuint l2depth = util_logbase2(depth);
- lastLevel = MAX2(MAX2(l2width, l2height), l2depth);
+ lastLevel = _mesa_get_tex_max_num_levels(stObj->base.Target,
+ width, height, depth) - 1;
}
/* Save the level=0 dimensions */
diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
index 889200686..c09261312 100644
--- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c
@@ -121,30 +121,16 @@ compute_num_levels(struct gl_context *ctx,
struct gl_texture_object *texObj,
GLenum target)
{
- if (target == GL_TEXTURE_RECTANGLE_ARB) {
- return 1;
- }
- else {
- const struct gl_texture_image *baseImage =
- _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel);
- GLuint size, numLevels;
+ const struct gl_texture_image *baseImage;
+ GLuint numLevels;
- size = MAX2(baseImage->Width2, baseImage->Height2);
- size = MAX2(size, baseImage->Depth2);
+ baseImage = _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel);
- numLevels = texObj->BaseLevel;
-
- while (size > 0) {
- numLevels++;
- size >>= 1;
- }
+ numLevels = texObj->BaseLevel + baseImage->MaxNumLevels;
+ numLevels = MIN2(numLevels, texObj->MaxLevel + 1);
+ assert(numLevels >= 1);
- numLevels = MIN2(numLevels, texObj->MaxLevel + 1);
-
- assert(numLevels >= 1);
-
- return numLevels;
- }
+ return numLevels;
}
diff --git a/mesalib/src/mesa/swrast/descrip.mms b/mesalib/src/mesa/swrast/descrip.mms
deleted file mode 100644
index 0b23deb3c..000000000
--- a/mesalib/src/mesa/swrast/descrip.mms
+++ /dev/null
@@ -1,82 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 3 October 2007
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
- define glapi [-.glapi]
- define main [-.main]
- define shader [-.shader]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
- s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \
- s_copypix.c s_depth.c s_fragprog.c \
- s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \
- s_masking.c s_points.c s_readpix.c \
- s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \
- s_triangle.c s_zoom.c s_atifragshader.c
-
-OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\
- s_bitmap.obj,s_blend.obj,s_blit.obj,s_fragprog.obj,\
- s_buffers.obj,s_context.obj,s_atifragshader.obj,\
- s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\
- s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,\
- s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\
- s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\
- s_zoom.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-s_atifragshader.obj : s_atifragshader.c
-s_aaline.obj : s_aaline.c
-s_aatriangle.obj : s_aatriangle.c
-s_accum.obj : s_accum.c
-s_alpha.obj : s_alpha.c
-s_bitmap.obj : s_bitmap.c
-s_blend.obj : s_blend.c
-s_blit.obj : s_blit.c
-s_buffers.obj : s_buffers.c
-s_context.obj : s_context.c
-s_copypix.obj : s_copypix.c
-s_depth.obj : s_depth.c
-s_drawpix.obj : s_drawpix.c
-s_feedback.obj : s_feedback.c
-s_fog.obj : s_fog.c
-s_imaging.obj : s_imaging.c
-s_lines.obj : s_lines.c
-s_logic.obj : s_logic.c
-s_masking.obj : s_masking.c
-s_points.obj : s_points.c
-s_readpix.obj : s_readpix.c
-s_span.obj : s_span.c
-s_stencil.obj : s_stencil.c
-s_texstore.obj : s_texstore.c
-s_texcombine.obj : s_texcombine.c
-s_texfilter.obj : s_texfilter.c
-s_triangle.obj : s_triangle.c
-s_zoom.obj : s_zoom.c
-s_fragprog.obj : s_fragprog.c
diff --git a/mesalib/src/mesa/swrast_setup/descrip.mms b/mesalib/src/mesa/swrast_setup/descrip.mms
deleted file mode 100644
index 32ffd8073..000000000
--- a/mesalib/src/mesa/swrast_setup/descrip.mms
+++ /dev/null
@@ -1,42 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 3 October 2007
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define tnl [-.tnl]
- define vbo [-.vbo]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
- define glapi [-.glapi]
- define main [-.main]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = ss_context.c ss_triangle.c
-
-OBJECTS = ss_context.obj,ss_triangle.obj
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-ss_context.obj : ss_context.c
-ss_triangle.obj : ss_triangle.c
diff --git a/mesalib/src/mesa/tnl/descrip.mms b/mesalib/src/mesa/tnl/descrip.mms
deleted file mode 100644
index 25dd1aecb..000000000
--- a/mesalib/src/mesa/tnl/descrip.mms
+++ /dev/null
@@ -1,68 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 39 September 2008
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define vbo [-.vbo]
- define shader [-.shader]
- define swrast [-.swrast]
- define array_cache [-.array_cache]
- define main [-.main]
- define glapi [-.glapi]
- define tnl [-.tnl]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES = t_context.c t_draw.c \
- t_pipeline.c t_vb_fog.c \
- t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
- t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
- t_vertex.c t_rasterpos.c\
- t_vertex_generic.c t_vp_build.c
-
-OBJECTS = t_context.obj,t_draw.obj,\
- t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
- t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
- t_vb_texmat.obj,t_vb_vertex.obj,t_rasterpos.obj,\
- t_vertex.obj,t_vertex_generic.obj,\
- t_vp_build.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-t_context.obj : t_context.c
-t_draw.obj : t_draw.c
-t_pipeline.obj : t_pipeline.c
-t_vb_fog.obj : t_vb_fog.c
-t_vb_light.obj : t_vb_light.c
-t_vb_normals.obj : t_vb_normals.c
-t_vb_points.obj : t_vb_points.c
-t_vb_program.obj : t_vb_program.c
-t_vb_render.obj : t_vb_render.c
-t_vb_texgen.obj : t_vb_texgen.c
-t_vb_texmat.obj : t_vb_texmat.c
-t_vb_vertex.obj : t_vb_vertex.c
-t_vertex.obj : t_vertex.c
-t_vertex_generic.obj : t_vertex_generic.c
-t_vp_build.obj : t_vp_build.c
-t_rasterpos.obj : t_rasterpos.c
diff --git a/mesalib/src/mesa/vbo/descrip.mms b/mesalib/src/mesa/vbo/descrip.mms
deleted file mode 100644
index c2a16a04f..000000000
--- a/mesalib/src/mesa/vbo/descrip.mms
+++ /dev/null
@@ -1,62 +0,0 @@
-# Makefile for core library for VMS
-# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl
-# Last revision : 3 October 2007
-
-.first
- define gl [---.include.gl]
- define math [-.math]
- define vbo [-.vbo]
- define tnl [-.tnl]
- define shader [-.shader]
- define swrast [-.swrast]
- define swrast_setup [-.swrast_setup]
- define main [-.main]
- define glapi [-.glapi]
-
-.include [---]mms-config.
-
-##### MACROS #####
-
-VPATH = RCS
-
-INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang]
-LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
-
-SOURCES =vbo_context.c,vbo_exec.c,vbo_exec_api.c,vbo_exec_array.c,\
- vbo_exec_draw.c,vbo_exec_eval.c,vbo_rebase.c,vbo_save.c,\
- vbo_save_api.c,vbo_save_draw.c,vbo_save_loopback.c,\
- vbo_split.c,vbo_split_copy.c,vbo_split_inplace.c
-
-OBJECTS =vbo_context.obj,vbo_exec.obj,vbo_exec_api.obj,vbo_exec_array.obj,\
- vbo_exec_draw.obj,vbo_exec_eval.obj,vbo_rebase.obj,vbo_save.obj,\
- vbo_save_api.obj,vbo_save_draw.obj,vbo_save_loopback.obj,\
- vbo_split.obj,vbo_split_copy.obj,vbo_split_inplace.obj
-
-##### RULES #####
-
-VERSION=Mesa V3.4
-
-##### TARGETS #####
-# Make the library
-$(LIBDIR)$(GL_LIB) : $(OBJECTS)
- @ library $(LIBDIR)$(GL_LIB) $(OBJECTS)
-
-clean :
- purge
- delete *.obj;*
-
-vbo_context.obj : vbo_context.c
-vbo_exec.obj : vbo_exec.c
-vbo_exec_api.obj : vbo_exec_api.c
-vbo_exec_array.obj : vbo_exec_array.c
-vbo_exec_draw.obj : vbo_exec_draw.c
-vbo_exec_eval.obj : vbo_exec_eval.c
-vbo_rebase.obj : vbo_rebase.c
-vbo_save.obj : vbo_save.c
-vbo_save_api.obj : vbo_save_api.c
-vbo_save_draw.obj : vbo_save_draw.c
-vbo_save_loopback.obj : vbo_save_loopback.c
-vbo_split.obj : vbo_split.c
-vbo_split_copy.obj : vbo_split_copy.c
-vbo_split_inplace.obj : vbo_split_inplace.c