[Bf-blender-cvs] [ee5e7a006e7] master: GPU: Remove unused and deprecated GPU_line_stipple()
Clément Foucault
noreply at git.blender.org
Sat Mar 23 23:54:24 CET 2019
Commit: ee5e7a006e7134bad6534abe331c6f9310380337
Author: Clément Foucault
Date: Sat Mar 23 23:42:30 2019 +0100
Branches: master
https://developer.blender.org/rBee5e7a006e7134bad6534abe331c6f9310380337
GPU: Remove unused and deprecated GPU_line_stipple()
===================================================================
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/screen/glutil.c
M source/blender/gpu/GPU_state.h
M source/blender/gpu/intern/gpu_state.c
===================================================================
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index 35e04106f31..9cb308d5145 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -103,7 +103,6 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state,
float xzoom, float yzoom, float color[4]);
void set_inverted_drawing(int enable);
-void setlinestyle(int nr);
/* own working polygon offset */
float bglPolygonOffsetCalc(const float winmat[16], float viewdist, float dist);
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index c96b7f04284..230d6179871 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -48,21 +48,6 @@
/* ******************************************** */
-void setlinestyle(int nr)
-{
- if (nr == 0) {
- GPU_line_stipple(false);
- }
- else {
-
- GPU_line_stipple(true);
- if (U.pixelsize > 1.0f)
- glLineStipple(nr, 0xCCCC);
- else
- glLineStipple(nr, 0xAAAA);
- }
-}
-
/* Invert line handling */
#define GL_TOGGLE(mode, onoff) (((onoff) ? glEnable : glDisable)(mode))
diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index c43a1711528..eb273608a3f 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -45,7 +45,6 @@ void GPU_depth_range(float near, float far);
void GPU_depth_test(bool enable);
bool GPU_depth_test_enabled(void);
void GPU_line_smooth(bool enable);
-void GPU_line_stipple(bool enable);
void GPU_line_width(float width);
void GPU_point_size(float size);
void GPU_polygon_smooth(bool enable);
diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c
index 98f905cd051..b77fc047473 100644
--- a/source/blender/gpu/intern/gpu_state.c
+++ b/source/blender/gpu/intern/gpu_state.c
@@ -100,16 +100,6 @@ void GPU_line_smooth(bool enable)
}
}
-void GPU_line_stipple(bool enable)
-{
- if (enable) {
- glEnable(GL_LINE_STIPPLE);
- }
- else {
- glDisable(GL_LINE_STIPPLE);
- }
-}
-
void GPU_line_width(float width)
{
float max_size = GPU_max_line_width();
More information about the Bf-blender-cvs
mailing list