Skip to content
Snippets Groups Projects

vkd3d-shader/hlsl: Refactor swizzles.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:mr0 into master
1 unresolved thread

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
2129 2131 return true;
2130 2132 }
2131 2133
2132 static bool invert_swizzle_matrix(uint32_t *swizzle, unsigned int *writemask, unsigned int *ret_width)
2134 static bool invert_swizzle_matrix(const struct hlsl_matrix_swizzle *swizzle,
2135 uint32_t *ret_inverted, unsigned int *writemask, unsigned int *ret_width)
2133 2136 {
2134 /* swizzle is 8 bits per component, each component is (from LSB) 4 bits X, then 4 bits Y.
2135 * components are indexed by their sources. i.e. the first component comes from the first
2136 * component of the rhs. */
2137 unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0;
2137 unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0;
2138 struct hlsl_matrix_swizzle new_swizzle = {{{0}}};
  • Francisco Casas
  • Francisco Casas
  • Francisco Casas
  • Francisco Casas
  • Francisco Casas
  • Francisco Casas
  • added 3 commits

    • d1d078e6 - vkd3d-shader/hlsl: Use a structure for matrix swizzles.
    • c5849e9f - vkd3d-shader/hlsl: Use swizzle helpers in more places.
    • fb49a2f7 - vkd3d-shader/hlsl: Store swizzles in vkd3d-shader format.

    Compare with previous version

  • Francisco Casas approved this merge request

    approved this merge request

  • Henri Verbeet approved this merge request

    approved this merge request

  • Henri Verbeet added 81 commits

    added 81 commits

    • fb49a2f7...ed6061df - 77 commits from branch wine:master
    • 70e2148f - vkd3d-shader/hlsl: Document matrix swizzles.
    • a905a78a - vkd3d-shader/hlsl: Use a structure for matrix swizzles.
    • 474a0ac4 - vkd3d-shader/hlsl: Use swizzle helpers in more places.
    • 09095403 - vkd3d-shader/hlsl: Store swizzles in vsir format.

    Compare with previous version

  • Please register or sign in to reply
    Loading