asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #43054 from lawnjelly/ewok_fix_largefvf

Browse source 
Fix transforms in custom shaders using large FVF
This commit is contained in:
Rémi Verschelde 2020-10-28 09:49:36 +01:00 committed by GitHub
commit efdc5f0f89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles2/rasterizer_canvas_gles2.cpp
View file

@ -2176,7 +2176,9 @@ void RasterizerCanvasGLES2::render_joined_item(const BItemJoined &p_bij, RenderI
}
}
// using software transform
// using software transform?
// (i.e. don't send the transform matrix, send identity, and either use baked verts,
// or large fvf where the transform is done in the shader from transform stored in the fvf.)
if (!p_bij.use_hardware_transform()) {
state.uniforms.modelview_matrix = Transform2D();
// final_modulate will be baked per item ref so the final_modulate can be an identity color

5
drivers/gles2/shaders/canvas.glsl
View file

@ -203,13 +203,16 @@ VERTEX_SHADER_CODE
temp += translate_attrib;
outvec.xy = temp;
#endif
#else
// transform is in uniforms
#if !defined(SKIP_TRANSFORM_USED)
outvec = extra_matrix_instance * outvec;
outvec = modelview_matrix * outvec;
#endif
#endif // not large integer
color_interp = color;
#ifdef USE_PIXEL_SNAP

4
drivers/gles3/rasterizer_canvas_gles3.cpp
View file

@ -1439,7 +1439,9 @@ void RasterizerCanvasGLES3::render_joined_item(const BItemJoined &p_bij, RenderI
// state.final_transform = p_ci->final_transform;
// state.extra_matrix = Transform2D();
// using software transform
// using software transform?
// (i.e. don't send the transform matrix, send identity, and either use baked verts,
// or large fvf where the transform is done in the shader from transform stored in the fvf.)
if (!p_bij.use_hardware_transform()) {
state.final_transform = Transform2D();
// final_modulate will be baked per item ref so the final_modulate can be an identity color

6
drivers/gles3/shaders/canvas.glsl
View file

@ -208,13 +208,17 @@ VERTEX_SHADER_CODE
temp += translate_attrib;
outvec.xy = temp;
#endif
#else
// transform is in uniforms
#if !defined(SKIP_TRANSFORM_USED)
outvec = extra_matrix * outvec;
outvec = modelview_matrix * outvec;
#endif
#endif // not large integer
#undef extra_matrix
color_interp = color;

5
drivers/gles_common/rasterizer_canvas_batcher.h
View file

@ -2068,6 +2068,11 @@ PREAMBLE(bool)::prefill_joined_item(FillState &r_fill_state, int &r_command_star
// break this extra matrix software path (as we don't want to unset it on the GPU etc)
if (r_fill_state.extra_matrix_sent) {
_prefill_default_batch(r_fill_state, command_num, *p_item);
// keep track of the combined matrix on the CPU in parallel, in case we use large vertex format
RasterizerCanvas::Item::CommandTransform *transform = static_cast<RasterizerCanvas::Item::CommandTransform *>(command);
const Transform2D &extra_matrix = transform->xform;
r_fill_state.transform_combined = p_item->final_transform * extra_matrix;
} else {
// Extra matrix fast path.
// Instead of sending the command immediately, we store the modified transform (in combined)