Skip to content

Commit 87176e9

Browse files
committed
remove viewextent from vulkan pipeline hash and frustum offset from map options
1 parent cf8bfc7 commit 87176e9

File tree

4 files changed

+1
-29
lines changed

4 files changed

+1
-29
lines changed

include/mbgl/map/map_options.hpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,6 @@ class MapOptions final {
133133
*/
134134
float pixelRatio() const;
135135

136-
/**
137-
* @brief Sets the frustum offset. Used to avoid rendering edges of the screen
138-
* which might be behind UI elements.
139-
*
140-
* @param offset_ A set of edge insets in logical pixels.
141-
* @return reference to MapOptions for chaining options together.
142-
*/
143-
MapOptions& withFrustumOffset(const EdgeInsets& offset_);
144-
145-
/**
146-
* @brief gets the previousl set (or default) frustum offset.
147-
*
148-
* @return frustum offset value
149-
*/
150-
EdgeInsets frustumOffset() const;
151-
152136
private:
153137
class Impl;
154138
std::unique_ptr<Impl> impl_;

platform/android/MapLibreAndroid/src/main/java/org/maplibre/android/maps/MapLibreMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void enableRenderingStatsView(boolean value) {
121121
* Set frustum offset to disable rendering for edges of the screen
122122
*/
123123
public void setFrustumOffset(@NonNull RectF offset) {
124-
nativeMapView.setFrustumOffset(offset);
124+
nativeMapView.setFrustumOffset(offset);
125125
}
126126

127127
public void setSwapBehaviorFlush(boolean flush) {

src/mbgl/map/map_options.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class MapOptions::Impl {
1010
NorthOrientation orientation = NorthOrientation::Upwards;
1111
bool crossSourceCollisions = true;
1212
Size size = {64, 64};
13-
EdgeInsets frustumOffset = {0.f, 0.f, 0.f, 0.f};
1413
float pixelRatio = 1.0;
1514
};
1615

@@ -74,15 +73,6 @@ Size MapOptions::size() const {
7473
return impl_->size;
7574
}
7675

77-
MapOptions& MapOptions::withFrustumOffset(const EdgeInsets& offset_) {
78-
impl_->frustumOffset = offset_;
79-
return *this;
80-
}
81-
82-
EdgeInsets MapOptions::frustumOffset() const {
83-
return impl_->frustumOffset;
84-
}
85-
8676
MapOptions& MapOptions::withPixelRatio(float ratio) {
8777
impl_->pixelRatio = ratio;
8878
return *this;

src/mbgl/vulkan/pipeline.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,6 @@ std::size_t PipelineInfo::hash() const {
406406
stencilDepthFail,
407407
wideLines,
408408
VkRenderPass(renderPass),
409-
viewExtent.width,
410-
viewExtent.height,
411409
vertexInputHash);
412410
}
413411

0 commit comments

Comments
 (0)