Skip to content

Conversation

@Keavon
Copy link
Member

@Keavon Keavon commented Jun 6, 2025

This merged PR was removed in a history rewrite of master, and replaced by:

  1. 5cacab2
  2. 6111440

This splits up the rename (5cacab2) from the logic changes (6111440) and replaces the logic changes from what was originally landed in this PR. This PR's removal of texture was undone, and instead the texture was retained but moved to the Raster struct with CPU and GPU textures, both assigned as variants to GraphicElement now. The old PR description is below.


Partly closes #1834

Before After
ImageFrameTable<Color> RasterDataTable<Color>
ImageFrameTable<SRGBA8> RasterDataTable<SRGBA8>
TaggedValue::ImageFrame(ImageFrameTable<Color>) TaggedValue::RasterData(RasterDataTable<Color>)
GraphicElement::RasterFrame GraphicElement::RasterData
pub enum RasterFrame {
ImageFrame(ImageFrameTable<Color>),
TextureFrame(TextureFrameTable),
}
Removed
But replaced with the temporarily unused:
pub enum RasterTexture {
Image(Image<Color>),
Texture(ImageTexture),
}
pub type TextureFrameTable = Instances<ImageTexture>; Removed

@github-actions
Copy link

github-actions bot commented Jun 6, 2025

Performance Benchmark Results

compile_demo_art_iai::compile_group::compile_to_proto with_setup_0:load_from_name(isometric-fountain)
Instructions: 25,031,517 (master) -> 25,053,651 (HEAD) : $$\color{red}+0.09\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                     310,889|    310,845          -0.01%
D1mw                      98,899|     98,883          -0.02%
DLmr                      28,523|     28,777          +0.89%
DLmw                      33,034|     33,262          +0.69%
Dr                     6,020,885|  6,026,772          +0.10%
Dw                     4,263,940|  4,269,067          +0.12%
EstimatedCycles       38,968,036| 39,062,100          +0.24%
I1mr                      34,948|     46,742         +33.75%
ILmr                         868|        852          -1.84%
Ir                    25,031,517| 25,053,651          +0.09%
L1hits                34,871,606| 34,893,020          +0.06%
LLhits                   382,311|    393,579          +2.95%
RamHits                   62,425|     62,891          +0.75%
TotalRW               35,316,342| 35,349,490          +0.09%

compile_demo_art_iai::compile_group::compile_to_proto with_setup_1:load_from_name(painted-dreams)
Instructions: 12,239,450 (master) -> 12,254,503 (HEAD) : $$\color{red}+0.12\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                     145,017|    144,596          -0.29%
D1mw                      46,800|     46,933          +0.28%
DLmr                         328|        379         +15.55%
DLmw                      14,469|     14,752          +1.96%
Dr                     2,943,311|  2,947,229          +0.13%
Dw                     2,075,689|  2,078,288          +0.13%
EstimatedCycles       18,556,752| 18,609,876          +0.29%
I1mr                      16,321|     21,955         +34.52%
ILmr                         728|        733          +0.69%
Ir                    12,239,450| 12,254,503          +0.12%
L1hits                17,050,312| 17,066,536          +0.10%
LLhits                   192,613|    197,620          +2.60%
RamHits                   15,525|     15,864          +2.18%
TotalRW               17,258,450| 17,280,020          +0.12%

compile_demo_art_iai::compile_group::compile_to_proto with_setup_2:load_from_name(procedural-string-lights)
Instructions: 2,648,941 (master) -> 3,463,621 (HEAD) : $$\color{red}+30.75\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                      27,362|     40,331         +47.40%
D1mw                      12,379|     12,747          +2.97%
DLmr                          18|         19          +5.56%
DLmw                       2,604|      3,771         +44.82%
Dr                       608,986|    823,653         +35.25%
Dw                       445,323|    581,783         +30.64%
EstimatedCycles        3,982,578|  5,242,333         +31.63%
I1mr                       5,026|      6,341         +26.16%
ILmr                         720|        730          +1.39%
Ir                     2,648,941|  3,463,621         +30.75%
L1hits                 3,658,483|  4,809,638         +31.47%
LLhits                    41,425|     54,899         +32.53%
RamHits                    3,342|      4,520         +35.25%
TotalRW                3,703,250|  4,869,057         +31.48%

compile_demo_art_iai::compile_group::compile_to_proto with_setup_3:load_from_name(parametric-dunescape)
Instructions: 12,496,281 (master) -> 12,500,732 (HEAD) : $$\color{red}+0.04\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                     152,638|    152,196          -0.29%
D1mw                      50,414|     50,286          -0.25%
DLmr                          39|         48         +23.08%
DLmw                      12,131|     12,041          -0.74%
Dr                     2,972,834|  2,974,316          +0.05%
Dw                     2,123,478|  2,124,876          +0.07%
EstimatedCycles       18,858,941| 18,877,542          +0.10%
I1mr                      15,900|     19,835         +24.75%
ILmr                         848|        856          +0.94%
Ir                    12,496,281| 12,500,732          +0.04%
L1hits                17,373,641| 17,377,607          +0.02%
LLhits                   205,934|    209,372          +1.67%
RamHits                   13,018|     12,945          -0.56%
TotalRW               17,592,593| 17,599,924          +0.04%

compile_demo_art_iai::compile_group::compile_to_proto with_setup_4:load_from_name(red-dress)
Instructions: 29,973,599 (master) -> 29,986,857 (HEAD) : $$\color{red}+0.04\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                     382,987|    381,668          -0.34%
D1mw                     126,615|    125,471          -0.90%
DLmr                      40,650|     40,728          +0.19%
DLmw                      63,798|     65,203          +2.20%
Dr                     7,151,274|  7,153,472          +0.03%
Dw                     5,073,123|  5,075,150          +0.04%
EstimatedCycles       47,547,788| 47,650,591          +0.22%
I1mr                      37,901|     50,729         +33.85%
ILmr                         878|        857          -2.39%
Ir                    29,973,599| 29,986,857          +0.04%
L1hits                41,650,493| 41,657,611          +0.02%
LLhits                   442,177|    451,080          +2.01%
RamHits                  105,326|    106,788          +1.39%
TotalRW               42,197,996| 42,215,479          +0.04%

compile_demo_art_iai::compile_group::compile_to_proto with_setup_5:load_from_name(valley-of-spires)
Instructions: 19,005,400 (master) -> 19,013,131 (HEAD) : $$\color{red}+0.04\%$$

Detailed metrics
Baselines:                master|       HEAD
D1mr                     234,692|    234,653          -0.02%
D1mw                      76,124|     76,499          +0.49%
DLmr                      12,213|     12,235          +0.18%
DLmw                      29,041|     28,567          -1.63%
Dr                     4,556,029|  4,558,987          +0.06%
Dw                     3,226,815|  3,229,681          +0.09%
EstimatedCycles       29,398,716| 29,432,877          +0.12%
I1mr                      26,487|     34,805         +31.40%
ILmr                         788|        773          -1.90%
Ir                    19,005,400| 19,013,131          +0.04%
L1hits                26,450,941| 26,455,842          +0.02%
LLhits                   295,261|    304,382          +3.09%
RamHits                   42,042|     41,575          -1.11%
TotalRW               26,788,244| 26,801,799          +0.05%

@Keavon Keavon merged commit 74a6881 into master Jun 6, 2025
4 checks passed
@Keavon Keavon deleted the instance-tables-pt7 branch June 6, 2025 04:26
seam0s-dev pushed a commit to seam0s-dev/Graphite that referenced this pull request Jun 8, 2025
…tureFrameTable (GraphiteEditor#2693)

* Partial commit 1/3: Unwrap RasterFrame and replace ImageFrameTable<Color> with RasterDataTable<Color>

* Partial commit 2/3: Removal of TextureFrameTable usages

* Partial commit 3/3: Document upgrade code

* Fix brush broken in part 6

* Re-save the demo artwork
mTvare6 pushed a commit that referenced this pull request Jun 8, 2025
…tureFrameTable (#2693)

* Partial commit 1/3: Unwrap RasterFrame and replace ImageFrameTable<Color> with RasterDataTable<Color>

* Partial commit 2/3: Removal of TextureFrameTable usages

* Partial commit 3/3: Document upgrade code

* Fix brush broken in part 6

* Re-save the demo artwork
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Tracking Issue: Instances tables

2 participants