expand f_push_run_from_... to basing its tab-advance logic on what base column it is starting at - currently assume this is 0, basically doing the most naive tab alignment version that will work for leading spaces but for nothing else, and also assume 4-space tab width for now

This commit is contained in:
Ryan Fleury
2024-05-24 14:40:07 -07:00
parent fd982d38fc
commit 5074b7f62e
4 changed files with 24 additions and 16 deletions
+10 -11
View File
@@ -125,26 +125,25 @@ r_d3d11_instance_buffer_from_size(U64 size)
return buffer;
}
internal
void r_res_kind_to_usage(R_ResourceKind kind, D3D11_USAGE* d3d11_usage, UINT* cpu_access_flags)
internal void
r_usage_access_flags_from_resource_kind(R_ResourceKind kind, D3D11_USAGE *out_d3d11_usage, UINT *out_cpu_access_flags)
{
//- rjf: kind -> usage * cpu access flags
switch(kind)
{
case R_ResourceKind_Static:
{
*d3d11_usage = D3D11_USAGE_IMMUTABLE;
*cpu_access_flags = 0;
*out_d3d11_usage = D3D11_USAGE_IMMUTABLE;
*out_cpu_access_flags = 0;
}break;
case R_ResourceKind_Dynamic:
{
*d3d11_usage = D3D11_USAGE_DEFAULT;
*cpu_access_flags = 0;
*out_d3d11_usage = D3D11_USAGE_DEFAULT;
*out_cpu_access_flags = 0;
}break;
case R_ResourceKind_Stream:
{
*d3d11_usage = D3D11_USAGE_DYNAMIC;
*cpu_access_flags = D3D11_CPU_ACCESS_WRITE;
*out_d3d11_usage = D3D11_USAGE_DYNAMIC;
*out_cpu_access_flags = D3D11_CPU_ACCESS_WRITE;
}break;
default:
{
@@ -587,7 +586,7 @@ r_tex2d_alloc(R_ResourceKind kind, Vec2S32 size, R_Tex2DFormat format, void *dat
D3D11_USAGE d3d11_usage = D3D11_USAGE_DEFAULT;
UINT cpu_access_flags = 0;
r_res_kind_to_usage(kind, &d3d11_usage, &cpu_access_flags);
r_usage_access_flags_from_resource_kind(kind, &d3d11_usage, &cpu_access_flags);
if (kind == R_ResourceKind_Static)
{
Assert(data != 0 && "static texture must have initial data provided");
@@ -732,7 +731,7 @@ r_buffer_alloc(R_ResourceKind kind, U64 size, void *data)
D3D11_USAGE d3d11_usage = D3D11_USAGE_DEFAULT;
UINT cpu_access_flags = 0;
r_res_kind_to_usage(kind, &d3d11_usage, &cpu_access_flags);
r_usage_access_flags_from_resource_kind(kind, &d3d11_usage, &cpu_access_flags);
if (kind == R_ResourceKind_Static)
{
Assert(data != 0 && "static buffer must have initial data provided");
+1 -1
View File
@@ -173,6 +173,6 @@ internal R_Handle r_d3d11_handle_from_tex2d(R_D3D11_Tex2D *texture);
internal R_D3D11_Buffer *r_d3d11_buffer_from_handle(R_Handle handle);
internal R_Handle r_d3d11_handle_from_buffer(R_D3D11_Buffer *buffer);
internal ID3D11Buffer *r_d3d11_instance_buffer_from_size(U64 size);
internal void r_res_kind_to_usage(R_ResourceKind kind, D3D11_USAGE* d3d11_usage, UINT* cpu_access_flags);
internal void r_usage_access_flags_from_resource_kind(R_ResourceKind kind, D3D11_USAGE *out_d3d11_usage, UINT *out_cpu_access_flags);
#endif // RENDER_D3D11_H