Skip to content
Permalink
Browse files
8242325: Remove VIS version of medialib
Reviewed-by: serb, bpb, erikj
  • Loading branch information
prrace committed Apr 8, 2020
1 parent 64365fb commit 3850f28ed87e0e9f55fe087415c0b0e4a8a27c2d
Showing 111 changed files with 3 additions and 90,158 deletions.
@@ -37,10 +37,6 @@ LIBAWT_DEFAULT_HEADER_DIRS := \

################################################################################

# We must not include java.desktop/unix/native/libmlib_image, which is only
# for usage by solaris-sparc in libmlib_image_v.
BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := /unix/

BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH

ifeq ($(call isTargetCpuBits, 64), true)
@@ -68,60 +64,6 @@ TARGETS += $(BUILD_LIBMLIB_IMAGE)

################################################################################

ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpuArch, sparc)), true)

# libmlib_image_v is basically built from mlib_image sources, with some additions
# and some exclusions.
LIBMLIB_IMAGE_V_SRC := \
libmlib_image \
common/awt/medialib \
#

LIBMLIB_IMAGE_V_CFLAGS := -xarch=sparcvis -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
$(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il

ifeq ($(call isTargetCpuBits, 64), true)
LIBMLIB_IMAGE_V_CFLAGS += -DMLIB_OS64BIT
endif

BUILD_LIBMLIB_IMAGE_V_EXFILES := \
awt_ImagingLib.c \
mlib_c_ImageAffine_BC.c \
mlib_c_ImageAffine_BC_S16.c \
mlib_c_ImageAffine_BC_U16.c \
mlib_c_ImageAffine_BL.c \
mlib_c_ImageAffine_BL_S16.c \
mlib_c_ImageAffine_BL_U16.c \
mlib_c_ImageAffine_NN.c \
mlib_c_ImageConvClearEdge.c \
mlib_c_ImageConvCopyEdge.c \
mlib_c_ImageConv_f.c \
mlib_c_ImageConvVersion.c \
mlib_c_ImageCopy.c \
mlib_c_ImageLookUp.c \
mlib_c_ImageLookUp_f.c \
#

$(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
NAME := mlib_image_v, \
SRC := $(LIBMLIB_IMAGE_V_SRC), \
EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
OPTIMIZATION := HIGHEST, \
CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBMLIB_IMAGE_V_CFLAGS), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -ljava -ljvm $(LIBM) $(LIBDL), \
))

$(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)

TARGETS += $(BUILD_LIBMLIB_IMAGE_V)

endif

################################################################################

LIBAWT_EXTRA_SRC := \
common/awt/debug \
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
@@ -155,16 +97,6 @@ ifeq ($(call isTargetOs, windows), true)
#
endif

ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
else
LIBAWT_EXCLUDES += \
$(TOPDIR)/src/$(MODULE)/unix/native/libawt/awt/medialib \
$(TOPDIR)/src/$(MODULE)/unix/native/libawt/java2d/loops \
$(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
#
endif

LIBAWT_EXTRA_HEADER_DIRS := \
$(LIBAWT_DEFAULT_HEADER_DIRS) \
$(call GetJavaHeaderDir, java.base) \
@@ -183,9 +115,6 @@ LIBAWT_EXTRA_HEADER_DIRS := \
LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)

ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
LIBAWT_CFLAGS += -xarch=sparcvis -DMLIB_ADD_SUFF \
$(TOPDIR)/src/$(MODULE)/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il

LIBAWT_ASFLAGS = -P -xarch=v9a
endif

@@ -394,7 +394,7 @@ jboolean RegisterPrimitives(JNIEnv *env,
CompositeType *pComp = pPrim->pCompType;
SurfaceType *pDst = pPrim->pDstType;

pPrim->funcs.initializer = MapAccelFunction(pPrim->funcs_c.initializer);
pPrim->funcs.initializer = pPrim->funcs_c.initializer;

/*
* Calculate the necessary SurfaceData lock flags for the
@@ -400,14 +400,6 @@ typedef struct _NativePrimitive {
jint dstflags;
} NativePrimitive;

/*
* This function should be defined to return a pointer to
* an accelerated version of a primitive function 'func_c'
* if it exists and to return a copy of the input parameter
* otherwise.
*/
extern AnyFunc* MapAccelFunction(AnyFunc *func_c);

/*
* The global collection of all primitive types. Specific NativePrimitive
* structures can be statically initialized by pointing to these structures.

This file was deleted.

0 comments on commit 3850f28

Please sign in to comment.