Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/cairo" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/glib" | |
| @@ -46,6 +45,7 @@ type GLTextureBuilder struct { | |||
| 46 | 45 | var xGLTextureBuilderGLibType func() types.GType | |
| 47 | 46 | ||
| 48 | 47 | func GLTextureBuilderGLibType() types.GType { | |
| 48 | + | core.LazyRegister(&xGLTextureBuilderGLibType, "GDK", "gdk_gl_texture_builder_get_type", false) | |
| 49 | 49 | return xGLTextureBuilderGLibType() | |
| 50 | 50 | } | |
| 51 | 51 | ||
| @@ -59,6 +59,7 @@ var xNewGLTextureBuilder func() uintptr | |||
| 59 | 59 | ||
| 60 | 60 | // Creates a new texture builder. | |
| 61 | 61 | func NewGLTextureBuilder() *GLTextureBuilder { | |
| 62 | + | core.LazyRegister(&xNewGLTextureBuilder, "GDK", "gdk_gl_texture_builder_new", false) | |
| 62 | 63 | var cls *GLTextureBuilder | |
| 63 | 64 | ||
| 64 | 65 | cret := xNewGLTextureBuilder() | |
| @@ -87,6 +88,7 @@ var xGLTextureBuilderBuild func(uintptr, uintptr, uintptr) uintptr | |||
| 87 | 88 | // It is possible to call this function multiple times to create multiple textures, | |
| 88 | 89 | // possibly with changing properties in between. | |
| 89 | 90 | func (x *GLTextureBuilder) Build(DestroyVar *glib.DestroyNotify, DataVar uintptr) *Texture { | |
| 91 | + | core.LazyRegister(&xGLTextureBuilderBuild, "GDK", "gdk_gl_texture_builder_build", false) | |
| 90 | 92 | var cls *Texture | |
| 91 | 93 | ||
| 92 | 94 | cret := xGLTextureBuilderBuild(x.GoPointer(), glib.NewCallbackNullable(DestroyVar), DataVar) | |
| @@ -103,6 +105,8 @@ var xGLTextureBuilderGetColorState func(uintptr) uintptr | |||
| 103 | 105 | ||
| 104 | 106 | // Gets the color state previously set via gdk_gl_texture_builder_set_color_state(). | |
| 105 | 107 | func (x *GLTextureBuilder) GetColorState() *ColorState { | |
| 108 | + | core.LazyRegister(&xGLTextureBuilderGetColorState, "GDK", "gdk_gl_texture_builder_get_color_state", false) | |
| 109 | + | ||
| 106 | 110 | cret := xGLTextureBuilderGetColorState(x.GoPointer()) | |
| 107 | 111 | if cret == 0 { | |
| 108 | 112 | return nil | |
| @@ -115,6 +119,7 @@ var xGLTextureBuilderGetContext func(uintptr) uintptr | |||
| 115 | 119 | // Gets the context previously set via gdk_gl_texture_builder_set_context() or | |
| 116 | 120 | // %NULL if none was set. | |
| 117 | 121 | func (x *GLTextureBuilder) GetContext() *GLContext { | |
| 122 | + | core.LazyRegister(&xGLTextureBuilderGetContext, "GDK", "gdk_gl_texture_builder_get_context", false) | |
| 118 | 123 | var cls *GLContext | |
| 119 | 124 | ||
| 120 | 125 | cret := xGLTextureBuilderGetContext(x.GoPointer()) | |
| @@ -132,6 +137,8 @@ var xGLTextureBuilderGetFormat func(uintptr) MemoryFormat | |||
| 132 | 137 | ||
| 133 | 138 | // Gets the format previously set via gdk_gl_texture_builder_set_format(). | |
| 134 | 139 | func (x *GLTextureBuilder) GetFormat() MemoryFormat { | |
| 140 | + | core.LazyRegister(&xGLTextureBuilderGetFormat, "GDK", "gdk_gl_texture_builder_get_format", false) | |
| 141 | + | ||
| 135 | 142 | cret := xGLTextureBuilderGetFormat(x.GoPointer()) | |
| 136 | 143 | return cret | |
| 137 | 144 | } | |
| @@ -140,6 +147,8 @@ var xGLTextureBuilderGetHasMipmap func(uintptr) bool | |||
| 140 | 147 | ||
| 141 | 148 | // Gets whether the texture has a mipmap. | |
| 142 | 149 | func (x *GLTextureBuilder) GetHasMipmap() bool { | |
| 150 | + | core.LazyRegister(&xGLTextureBuilderGetHasMipmap, "GDK", "gdk_gl_texture_builder_get_has_mipmap", false) | |
| 151 | + | ||
| 143 | 152 | cret := xGLTextureBuilderGetHasMipmap(x.GoPointer()) | |
| 144 | 153 | return cret | |
| 145 | 154 | } | |
| @@ -149,6 +158,8 @@ var xGLTextureBuilderGetHeight func(uintptr) int | |||
| 149 | 158 | // Gets the height previously set via gdk_gl_texture_builder_set_height() or | |
| 150 | 159 | // 0 if the height wasn't set. | |
| 151 | 160 | func (x *GLTextureBuilder) GetHeight() int { | |
| 161 | + | core.LazyRegister(&xGLTextureBuilderGetHeight, "GDK", "gdk_gl_texture_builder_get_height", false) | |
| 162 | + | ||
| 152 | 163 | cret := xGLTextureBuilderGetHeight(x.GoPointer()) | |
| 153 | 164 | return cret | |
| 154 | 165 | } | |
| @@ -158,6 +169,8 @@ var xGLTextureBuilderGetId func(uintptr) uint | |||
| 158 | 169 | // Gets the texture id previously set via gdk_gl_texture_builder_set_id() or | |
| 159 | 170 | // 0 if the id wasn't set. | |
| 160 | 171 | func (x *GLTextureBuilder) GetId() uint { | |
| 172 | + | core.LazyRegister(&xGLTextureBuilderGetId, "GDK", "gdk_gl_texture_builder_get_id", false) | |
| 173 | + | ||
| 161 | 174 | cret := xGLTextureBuilderGetId(x.GoPointer()) | |
| 162 | 175 | return cret | |
| 163 | 176 | } | |
| @@ -166,6 +179,8 @@ var xGLTextureBuilderGetSync func(uintptr) uintptr | |||
| 166 | 179 | ||
| 167 | 180 | // Gets the `GLsync` previously set via gdk_gl_texture_builder_set_sync(). | |
| 168 | 181 | func (x *GLTextureBuilder) GetSync() uintptr { | |
| 182 | + | core.LazyRegister(&xGLTextureBuilderGetSync, "GDK", "gdk_gl_texture_builder_get_sync", false) | |
| 183 | + | ||
| 169 | 184 | cret := xGLTextureBuilderGetSync(x.GoPointer()) | |
| 170 | 185 | return cret | |
| 171 | 186 | } | |
| @@ -175,6 +190,8 @@ var xGLTextureBuilderGetUpdateRegion func(uintptr) uintptr | |||
| 175 | 190 | // Gets the region previously set via gdk_gl_texture_builder_set_update_region() or | |
| 176 | 191 | // %NULL if none was set. | |
| 177 | 192 | func (x *GLTextureBuilder) GetUpdateRegion() *cairo.Region { | |
| 193 | + | core.LazyRegister(&xGLTextureBuilderGetUpdateRegion, "GDK", "gdk_gl_texture_builder_get_update_region", false) | |
| 194 | + | ||
| 178 | 195 | cret := xGLTextureBuilderGetUpdateRegion(x.GoPointer()) | |
| 179 | 196 | if cret == 0 { | |
| 180 | 197 | return nil | |
| @@ -187,6 +204,7 @@ var xGLTextureBuilderGetUpdateTexture func(uintptr) uintptr | |||
| 187 | 204 | // Gets the texture previously set via gdk_gl_texture_builder_set_update_texture() or | |
| 188 | 205 | // %NULL if none was set. | |
| 189 | 206 | func (x *GLTextureBuilder) GetUpdateTexture() *Texture { | |
| 207 | + | core.LazyRegister(&xGLTextureBuilderGetUpdateTexture, "GDK", "gdk_gl_texture_builder_get_update_texture", false) | |
| 190 | 208 | var cls *Texture | |
| 191 | 209 | ||
| 192 | 210 | cret := xGLTextureBuilderGetUpdateTexture(x.GoPointer()) | |
| @@ -205,6 +223,8 @@ var xGLTextureBuilderGetWidth func(uintptr) int | |||
| 205 | 223 | // Gets the width previously set via gdk_gl_texture_builder_set_width() or | |
| 206 | 224 | // 0 if the width wasn't set. | |
| 207 | 225 | func (x *GLTextureBuilder) GetWidth() int { | |
| 226 | + | core.LazyRegister(&xGLTextureBuilderGetWidth, "GDK", "gdk_gl_texture_builder_get_width", false) | |
| 227 | + | ||
| 208 | 228 | cret := xGLTextureBuilderGetWidth(x.GoPointer()) | |
| 209 | 229 | return cret | |
| 210 | 230 | } | |
| @@ -216,6 +236,8 @@ var xGLTextureBuilderSetColorState func(uintptr, *ColorState) | |||
| 216 | 236 | // By default, the sRGB colorstate is used. If you don't know what | |
| 217 | 237 | // colorstates are, this is probably the right thing. | |
| 218 | 238 | func (x *GLTextureBuilder) SetColorState(ColorStateVar *ColorState) { | |
| 239 | + | core.LazyRegister(&xGLTextureBuilderSetColorState, "GDK", "gdk_gl_texture_builder_set_color_state", false) | |
| 240 | + | ||
| 219 | 241 | xGLTextureBuilderSetColorState(x.GoPointer(), ColorStateVar) | |
| 220 | 242 | } | |
| 221 | 243 | ||
| @@ -226,6 +248,8 @@ var xGLTextureBuilderSetContext func(uintptr, uintptr) | |||
| 226 | 248 | // | |
| 227 | 249 | // The context must be set before calling [method@Gdk.GLTextureBuilder.build]. | |
| 228 | 250 | func (x *GLTextureBuilder) SetContext(ContextVar *GLContext) { | |
| 251 | + | core.LazyRegister(&xGLTextureBuilderSetContext, "GDK", "gdk_gl_texture_builder_set_context", false) | |
| 252 | + | ||
| 229 | 253 | xGLTextureBuilderSetContext(x.GoPointer(), ContextVar.GoPointer()) | |
| 230 | 254 | } | |
| 231 | 255 | ||
| @@ -248,6 +272,8 @@ var xGLTextureBuilderSetFormat func(uintptr, MemoryFormat) | |||
| 248 | 272 | // Non-RGBA textures need to have swizzling parameters set up properly to be usable | |
| 249 | 273 | // in GSK's shaders. | |
| 250 | 274 | func (x *GLTextureBuilder) SetFormat(FormatVar MemoryFormat) { | |
| 275 | + | core.LazyRegister(&xGLTextureBuilderSetFormat, "GDK", "gdk_gl_texture_builder_set_format", false) | |
| 276 | + | ||
| 251 | 277 | xGLTextureBuilderSetFormat(x.GoPointer(), FormatVar) | |
| 252 | 278 | } | |
| 253 | 279 | ||
| @@ -258,6 +284,8 @@ var xGLTextureBuilderSetHasMipmap func(uintptr, bool) | |||
| 258 | 284 | // | |
| 259 | 285 | // Typically, the `glGenerateMipmap` function is used to generate a mimap. | |
| 260 | 286 | func (x *GLTextureBuilder) SetHasMipmap(HasMipmapVar bool) { | |
| 287 | + | core.LazyRegister(&xGLTextureBuilderSetHasMipmap, "GDK", "gdk_gl_texture_builder_set_has_mipmap", false) | |
| 288 | + | ||
| 261 | 289 | xGLTextureBuilderSetHasMipmap(x.GoPointer(), HasMipmapVar) | |
| 262 | 290 | } | |
| 263 | 291 | ||
| @@ -267,6 +295,8 @@ var xGLTextureBuilderSetHeight func(uintptr, int) | |||
| 267 | 295 | // | |
| 268 | 296 | // The height must be set before calling [method@Gdk.GLTextureBuilder.build]. | |
| 269 | 297 | func (x *GLTextureBuilder) SetHeight(HeightVar int) { | |
| 298 | + | core.LazyRegister(&xGLTextureBuilderSetHeight, "GDK", "gdk_gl_texture_builder_set_height", false) | |
| 299 | + | ||
| 270 | 300 | xGLTextureBuilderSetHeight(x.GoPointer(), HeightVar) | |
| 271 | 301 | } | |
| 272 | 302 | ||
| @@ -278,6 +308,8 @@ var xGLTextureBuilderSetId func(uintptr, uint) | |||
| 278 | 308 | // | |
| 279 | 309 | // The id must be set before calling [method@Gdk.GLTextureBuilder.build]. | |
| 280 | 310 | func (x *GLTextureBuilder) SetId(IdVar uint) { | |
| 311 | + | core.LazyRegister(&xGLTextureBuilderSetId, "GDK", "gdk_gl_texture_builder_set_id", false) | |
| 312 | + | ||
| 281 | 313 | xGLTextureBuilderSetId(x.GoPointer(), IdVar) | |
| 282 | 314 | } | |
| 283 | 315 | ||
| @@ -292,6 +324,8 @@ var xGLTextureBuilderSetSync func(uintptr, uintptr) | |||
| 292 | 324 | // The texture builder does not destroy it and it is the callers | |
| 293 | 325 | // responsibility to make sure it doesn't leak. | |
| 294 | 326 | func (x *GLTextureBuilder) SetSync(SyncVar uintptr) { | |
| 327 | + | core.LazyRegister(&xGLTextureBuilderSetSync, "GDK", "gdk_gl_texture_builder_set_sync", false) | |
| 328 | + | ||
| 295 | 329 | xGLTextureBuilderSetSync(x.GoPointer(), SyncVar) | |
| 296 | 330 | } | |
| 297 | 331 | ||
| @@ -308,6 +342,8 @@ var xGLTextureBuilderSetUpdateRegion func(uintptr, *cairo.Region) | |||
| 308 | 342 | // | |
| 309 | 343 | // An example would be a screen recording where only the mouse pointer moves. | |
| 310 | 344 | func (x *GLTextureBuilder) SetUpdateRegion(RegionVar *cairo.Region) { | |
| 345 | + | core.LazyRegister(&xGLTextureBuilderSetUpdateRegion, "GDK", "gdk_gl_texture_builder_set_update_region", false) | |
| 346 | + | ||
| 311 | 347 | xGLTextureBuilderSetUpdateRegion(x.GoPointer(), RegionVar) | |
| 312 | 348 | } | |
| 313 | 349 | ||
| @@ -316,6 +352,8 @@ var xGLTextureBuilderSetUpdateTexture func(uintptr, uintptr) | |||
| 316 | 352 | // Sets the texture to be updated by this texture. See | |
| 317 | 353 | // [method@Gdk.GLTextureBuilder.set_update_region] for an explanation. | |
| 318 | 354 | func (x *GLTextureBuilder) SetUpdateTexture(TextureVar *Texture) { | |
| 355 | + | core.LazyRegister(&xGLTextureBuilderSetUpdateTexture, "GDK", "gdk_gl_texture_builder_set_update_texture", false) | |
| 356 | + | ||
| 319 | 357 | xGLTextureBuilderSetUpdateTexture(x.GoPointer(), TextureVar.GoPointer()) | |
| 320 | 358 | } | |
| 321 | 359 | ||
| @@ -325,6 +363,8 @@ var xGLTextureBuilderSetWidth func(uintptr, int) | |||
| 325 | 363 | // | |
| 326 | 364 | // The width must be set before calling [method@Gdk.GLTextureBuilder.build]. | |
| 327 | 365 | func (x *GLTextureBuilder) SetWidth(WidthVar int) { | |
| 366 | + | core.LazyRegister(&xGLTextureBuilderSetWidth, "GDK", "gdk_gl_texture_builder_set_width", false) | |
| 367 | + | ||
| 328 | 368 | xGLTextureBuilderSetWidth(x.GoPointer(), WidthVar) | |
| 329 | 369 | } | |
| 330 | 370 | ||
| @@ -465,38 +505,4 @@ func (x *GLTextureBuilder) GetPropertyWidth() int { | |||
| 465 | 505 | func init() { | |
| 466 | 506 | core.SetPackageName("GDK", "gtk4") | |
| 467 | 507 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 468 | - | var libs []uintptr | |
| 469 | - | for _, libPath := range core.GetPaths("GDK") { | |
| 470 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 471 | - | if err != nil { | |
| 472 | - | panic(err) | |
| 473 | - | } | |
| 474 | - | libs = append(libs, lib) | |
| 475 | - | } | |
| 476 | - | ||
| 477 | - | core.PuregoSafeRegister(&xGLTextureBuilderGLibType, libs, "gdk_gl_texture_builder_get_type") | |
| 478 | - | ||
| 479 | - | core.PuregoSafeRegister(&xNewGLTextureBuilder, libs, "gdk_gl_texture_builder_new") | |
| 480 | - | ||
| 481 | - | core.PuregoSafeRegister(&xGLTextureBuilderBuild, libs, "gdk_gl_texture_builder_build") | |
| 482 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetColorState, libs, "gdk_gl_texture_builder_get_color_state") | |
| 483 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetContext, libs, "gdk_gl_texture_builder_get_context") | |
| 484 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetFormat, libs, "gdk_gl_texture_builder_get_format") | |
| 485 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHasMipmap, libs, "gdk_gl_texture_builder_get_has_mipmap") | |
| 486 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHeight, libs, "gdk_gl_texture_builder_get_height") | |
| 487 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetId, libs, "gdk_gl_texture_builder_get_id") | |
| 488 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetSync, libs, "gdk_gl_texture_builder_get_sync") | |
| 489 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateRegion, libs, "gdk_gl_texture_builder_get_update_region") | |
| 490 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateTexture, libs, "gdk_gl_texture_builder_get_update_texture") | |
| 491 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetWidth, libs, "gdk_gl_texture_builder_get_width") | |
| 492 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetColorState, libs, "gdk_gl_texture_builder_set_color_state") | |
| 493 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetContext, libs, "gdk_gl_texture_builder_set_context") | |
| 494 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetFormat, libs, "gdk_gl_texture_builder_set_format") | |
| 495 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHasMipmap, libs, "gdk_gl_texture_builder_set_has_mipmap") | |
| 496 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHeight, libs, "gdk_gl_texture_builder_set_height") | |
| 497 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetId, libs, "gdk_gl_texture_builder_set_id") | |
| 498 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetSync, libs, "gdk_gl_texture_builder_set_sync") | |
| 499 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateRegion, libs, "gdk_gl_texture_builder_set_update_region") | |
| 500 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateTexture, libs, "gdk_gl_texture_builder_set_update_texture") | |
| 501 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetWidth, libs, "gdk_gl_texture_builder_set_width") | |
| 502 | 508 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/cairo" | 9 | "github.com/bnema/puregotk/v4/cairo" | ||
| 11 | "github.com/bnema/puregotk/v4/glib" | 10 | "github.com/bnema/puregotk/v4/glib" | ||
| @@ -46,6 +45,7 @@ type GLTextureBuilder struct { | |||||
| 46 | var xGLTextureBuilderGLibType func() types.GType | 45 | var xGLTextureBuilderGLibType func() types.GType | ||
| 47 | 46 | ||||
| 48 | func GLTextureBuilderGLibType() types.GType { | 47 | func GLTextureBuilderGLibType() types.GType { | ||
| 48 | + | core.LazyRegister(&xGLTextureBuilderGLibType, "GDK", "gdk_gl_texture_builder_get_type", false) | |||
| 49 | return xGLTextureBuilderGLibType() | 49 | return xGLTextureBuilderGLibType() | ||
| 50 | } | 50 | } | ||
| 51 | 51 | ||||
| @@ -59,6 +59,7 @@ var xNewGLTextureBuilder func() uintptr | |||||
| 59 | 59 | ||||
| 60 | // Creates a new texture builder. | 60 | // Creates a new texture builder. | ||
| 61 | func NewGLTextureBuilder() *GLTextureBuilder { | 61 | func NewGLTextureBuilder() *GLTextureBuilder { | ||
| 62 | + | core.LazyRegister(&xNewGLTextureBuilder, "GDK", "gdk_gl_texture_builder_new", false) | |||
| 62 | var cls *GLTextureBuilder | 63 | var cls *GLTextureBuilder | ||
| 63 | 64 | ||||
| 64 | cret := xNewGLTextureBuilder() | 65 | cret := xNewGLTextureBuilder() | ||
| @@ -87,6 +88,7 @@ var xGLTextureBuilderBuild func(uintptr, uintptr, uintptr) uintptr | |||||
| 87 | // It is possible to call this function multiple times to create multiple textures, | 88 | // It is possible to call this function multiple times to create multiple textures, | ||
| 88 | // possibly with changing properties in between. | 89 | // possibly with changing properties in between. | ||
| 89 | func (x *GLTextureBuilder) Build(DestroyVar *glib.DestroyNotify, DataVar uintptr) *Texture { | 90 | func (x *GLTextureBuilder) Build(DestroyVar *glib.DestroyNotify, DataVar uintptr) *Texture { | ||
| 91 | + | core.LazyRegister(&xGLTextureBuilderBuild, "GDK", "gdk_gl_texture_builder_build", false) | |||
| 90 | var cls *Texture | 92 | var cls *Texture | ||
| 91 | 93 | ||||
| 92 | cret := xGLTextureBuilderBuild(x.GoPointer(), glib.NewCallbackNullable(DestroyVar), DataVar) | 94 | cret := xGLTextureBuilderBuild(x.GoPointer(), glib.NewCallbackNullable(DestroyVar), DataVar) | ||
| @@ -103,6 +105,8 @@ var xGLTextureBuilderGetColorState func(uintptr) uintptr | |||||
| 103 | 105 | ||||
| 104 | // Gets the color state previously set via gdk_gl_texture_builder_set_color_state(). | 106 | // Gets the color state previously set via gdk_gl_texture_builder_set_color_state(). | ||
| 105 | func (x *GLTextureBuilder) GetColorState() *ColorState { | 107 | func (x *GLTextureBuilder) GetColorState() *ColorState { | ||
| 108 | + | core.LazyRegister(&xGLTextureBuilderGetColorState, "GDK", "gdk_gl_texture_builder_get_color_state", false) | |||
| 109 | + | ||||
| 106 | cret := xGLTextureBuilderGetColorState(x.GoPointer()) | 110 | cret := xGLTextureBuilderGetColorState(x.GoPointer()) | ||
| 107 | if cret == 0 { | 111 | if cret == 0 { | ||
| 108 | return nil | 112 | return nil | ||
| @@ -115,6 +119,7 @@ var xGLTextureBuilderGetContext func(uintptr) uintptr | |||||
| 115 | // Gets the context previously set via gdk_gl_texture_builder_set_context() or | 119 | // Gets the context previously set via gdk_gl_texture_builder_set_context() or | ||
| 116 | // %NULL if none was set. | 120 | // %NULL if none was set. | ||
| 117 | func (x *GLTextureBuilder) GetContext() *GLContext { | 121 | func (x *GLTextureBuilder) GetContext() *GLContext { | ||
| 122 | + | core.LazyRegister(&xGLTextureBuilderGetContext, "GDK", "gdk_gl_texture_builder_get_context", false) | |||
| 118 | var cls *GLContext | 123 | var cls *GLContext | ||
| 119 | 124 | ||||
| 120 | cret := xGLTextureBuilderGetContext(x.GoPointer()) | 125 | cret := xGLTextureBuilderGetContext(x.GoPointer()) | ||
| @@ -132,6 +137,8 @@ var xGLTextureBuilderGetFormat func(uintptr) MemoryFormat | |||||
| 132 | 137 | ||||
| 133 | // Gets the format previously set via gdk_gl_texture_builder_set_format(). | 138 | // Gets the format previously set via gdk_gl_texture_builder_set_format(). | ||
| 134 | func (x *GLTextureBuilder) GetFormat() MemoryFormat { | 139 | func (x *GLTextureBuilder) GetFormat() MemoryFormat { | ||
| 140 | + | core.LazyRegister(&xGLTextureBuilderGetFormat, "GDK", "gdk_gl_texture_builder_get_format", false) | |||
| 141 | + | ||||
| 135 | cret := xGLTextureBuilderGetFormat(x.GoPointer()) | 142 | cret := xGLTextureBuilderGetFormat(x.GoPointer()) | ||
| 136 | return cret | 143 | return cret | ||
| 137 | } | 144 | } | ||
| @@ -140,6 +147,8 @@ var xGLTextureBuilderGetHasMipmap func(uintptr) bool | |||||
| 140 | 147 | ||||
| 141 | // Gets whether the texture has a mipmap. | 148 | // Gets whether the texture has a mipmap. | ||
| 142 | func (x *GLTextureBuilder) GetHasMipmap() bool { | 149 | func (x *GLTextureBuilder) GetHasMipmap() bool { | ||
| 150 | + | core.LazyRegister(&xGLTextureBuilderGetHasMipmap, "GDK", "gdk_gl_texture_builder_get_has_mipmap", false) | |||
| 151 | + | ||||
| 143 | cret := xGLTextureBuilderGetHasMipmap(x.GoPointer()) | 152 | cret := xGLTextureBuilderGetHasMipmap(x.GoPointer()) | ||
| 144 | return cret | 153 | return cret | ||
| 145 | } | 154 | } | ||
| @@ -149,6 +158,8 @@ var xGLTextureBuilderGetHeight func(uintptr) int | |||||
| 149 | // Gets the height previously set via gdk_gl_texture_builder_set_height() or | 158 | // Gets the height previously set via gdk_gl_texture_builder_set_height() or | ||
| 150 | // 0 if the height wasn't set. | 159 | // 0 if the height wasn't set. | ||
| 151 | func (x *GLTextureBuilder) GetHeight() int { | 160 | func (x *GLTextureBuilder) GetHeight() int { | ||
| 161 | + | core.LazyRegister(&xGLTextureBuilderGetHeight, "GDK", "gdk_gl_texture_builder_get_height", false) | |||
| 162 | + | ||||
| 152 | cret := xGLTextureBuilderGetHeight(x.GoPointer()) | 163 | cret := xGLTextureBuilderGetHeight(x.GoPointer()) | ||
| 153 | return cret | 164 | return cret | ||
| 154 | } | 165 | } | ||
| @@ -158,6 +169,8 @@ var xGLTextureBuilderGetId func(uintptr) uint | |||||
| 158 | // Gets the texture id previously set via gdk_gl_texture_builder_set_id() or | 169 | // Gets the texture id previously set via gdk_gl_texture_builder_set_id() or | ||
| 159 | // 0 if the id wasn't set. | 170 | // 0 if the id wasn't set. | ||
| 160 | func (x *GLTextureBuilder) GetId() uint { | 171 | func (x *GLTextureBuilder) GetId() uint { | ||
| 172 | + | core.LazyRegister(&xGLTextureBuilderGetId, "GDK", "gdk_gl_texture_builder_get_id", false) | |||
| 173 | + | ||||
| 161 | cret := xGLTextureBuilderGetId(x.GoPointer()) | 174 | cret := xGLTextureBuilderGetId(x.GoPointer()) | ||
| 162 | return cret | 175 | return cret | ||
| 163 | } | 176 | } | ||
| @@ -166,6 +179,8 @@ var xGLTextureBuilderGetSync func(uintptr) uintptr | |||||
| 166 | 179 | ||||
| 167 | // Gets the `GLsync` previously set via gdk_gl_texture_builder_set_sync(). | 180 | // Gets the `GLsync` previously set via gdk_gl_texture_builder_set_sync(). | ||
| 168 | func (x *GLTextureBuilder) GetSync() uintptr { | 181 | func (x *GLTextureBuilder) GetSync() uintptr { | ||
| 182 | + | core.LazyRegister(&xGLTextureBuilderGetSync, "GDK", "gdk_gl_texture_builder_get_sync", false) | |||
| 183 | + | ||||
| 169 | cret := xGLTextureBuilderGetSync(x.GoPointer()) | 184 | cret := xGLTextureBuilderGetSync(x.GoPointer()) | ||
| 170 | return cret | 185 | return cret | ||
| 171 | } | 186 | } | ||
| @@ -175,6 +190,8 @@ var xGLTextureBuilderGetUpdateRegion func(uintptr) uintptr | |||||
| 175 | // Gets the region previously set via gdk_gl_texture_builder_set_update_region() or | 190 | // Gets the region previously set via gdk_gl_texture_builder_set_update_region() or | ||
| 176 | // %NULL if none was set. | 191 | // %NULL if none was set. | ||
| 177 | func (x *GLTextureBuilder) GetUpdateRegion() *cairo.Region { | 192 | func (x *GLTextureBuilder) GetUpdateRegion() *cairo.Region { | ||
| 193 | + | core.LazyRegister(&xGLTextureBuilderGetUpdateRegion, "GDK", "gdk_gl_texture_builder_get_update_region", false) | |||
| 194 | + | ||||
| 178 | cret := xGLTextureBuilderGetUpdateRegion(x.GoPointer()) | 195 | cret := xGLTextureBuilderGetUpdateRegion(x.GoPointer()) | ||
| 179 | if cret == 0 { | 196 | if cret == 0 { | ||
| 180 | return nil | 197 | return nil | ||
| @@ -187,6 +204,7 @@ var xGLTextureBuilderGetUpdateTexture func(uintptr) uintptr | |||||
| 187 | // Gets the texture previously set via gdk_gl_texture_builder_set_update_texture() or | 204 | // Gets the texture previously set via gdk_gl_texture_builder_set_update_texture() or | ||
| 188 | // %NULL if none was set. | 205 | // %NULL if none was set. | ||
| 189 | func (x *GLTextureBuilder) GetUpdateTexture() *Texture { | 206 | func (x *GLTextureBuilder) GetUpdateTexture() *Texture { | ||
| 207 | + | core.LazyRegister(&xGLTextureBuilderGetUpdateTexture, "GDK", "gdk_gl_texture_builder_get_update_texture", false) | |||
| 190 | var cls *Texture | 208 | var cls *Texture | ||
| 191 | 209 | ||||
| 192 | cret := xGLTextureBuilderGetUpdateTexture(x.GoPointer()) | 210 | cret := xGLTextureBuilderGetUpdateTexture(x.GoPointer()) | ||
| @@ -205,6 +223,8 @@ var xGLTextureBuilderGetWidth func(uintptr) int | |||||
| 205 | // Gets the width previously set via gdk_gl_texture_builder_set_width() or | 223 | // Gets the width previously set via gdk_gl_texture_builder_set_width() or | ||
| 206 | // 0 if the width wasn't set. | 224 | // 0 if the width wasn't set. | ||
| 207 | func (x *GLTextureBuilder) GetWidth() int { | 225 | func (x *GLTextureBuilder) GetWidth() int { | ||
| 226 | + | core.LazyRegister(&xGLTextureBuilderGetWidth, "GDK", "gdk_gl_texture_builder_get_width", false) | |||
| 227 | + | ||||
| 208 | cret := xGLTextureBuilderGetWidth(x.GoPointer()) | 228 | cret := xGLTextureBuilderGetWidth(x.GoPointer()) | ||
| 209 | return cret | 229 | return cret | ||
| 210 | } | 230 | } | ||
| @@ -216,6 +236,8 @@ var xGLTextureBuilderSetColorState func(uintptr, *ColorState) | |||||
| 216 | // By default, the sRGB colorstate is used. If you don't know what | 236 | // By default, the sRGB colorstate is used. If you don't know what | ||
| 217 | // colorstates are, this is probably the right thing. | 237 | // colorstates are, this is probably the right thing. | ||
| 218 | func (x *GLTextureBuilder) SetColorState(ColorStateVar *ColorState) { | 238 | func (x *GLTextureBuilder) SetColorState(ColorStateVar *ColorState) { | ||
| 239 | + | core.LazyRegister(&xGLTextureBuilderSetColorState, "GDK", "gdk_gl_texture_builder_set_color_state", false) | |||
| 240 | + | ||||
| 219 | xGLTextureBuilderSetColorState(x.GoPointer(), ColorStateVar) | 241 | xGLTextureBuilderSetColorState(x.GoPointer(), ColorStateVar) | ||
| 220 | } | 242 | } | ||
| 221 | 243 | ||||
| @@ -226,6 +248,8 @@ var xGLTextureBuilderSetContext func(uintptr, uintptr) | |||||
| 226 | // | 248 | // | ||
| 227 | // The context must be set before calling [method@Gdk.GLTextureBuilder.build]. | 249 | // The context must be set before calling [method@Gdk.GLTextureBuilder.build]. | ||
| 228 | func (x *GLTextureBuilder) SetContext(ContextVar *GLContext) { | 250 | func (x *GLTextureBuilder) SetContext(ContextVar *GLContext) { | ||
| 251 | + | core.LazyRegister(&xGLTextureBuilderSetContext, "GDK", "gdk_gl_texture_builder_set_context", false) | |||
| 252 | + | ||||
| 229 | xGLTextureBuilderSetContext(x.GoPointer(), ContextVar.GoPointer()) | 253 | xGLTextureBuilderSetContext(x.GoPointer(), ContextVar.GoPointer()) | ||
| 230 | } | 254 | } | ||
| 231 | 255 | ||||
| @@ -248,6 +272,8 @@ var xGLTextureBuilderSetFormat func(uintptr, MemoryFormat) | |||||
| 248 | // Non-RGBA textures need to have swizzling parameters set up properly to be usable | 272 | // Non-RGBA textures need to have swizzling parameters set up properly to be usable | ||
| 249 | // in GSK's shaders. | 273 | // in GSK's shaders. | ||
| 250 | func (x *GLTextureBuilder) SetFormat(FormatVar MemoryFormat) { | 274 | func (x *GLTextureBuilder) SetFormat(FormatVar MemoryFormat) { | ||
| 275 | + | core.LazyRegister(&xGLTextureBuilderSetFormat, "GDK", "gdk_gl_texture_builder_set_format", false) | |||
| 276 | + | ||||
| 251 | xGLTextureBuilderSetFormat(x.GoPointer(), FormatVar) | 277 | xGLTextureBuilderSetFormat(x.GoPointer(), FormatVar) | ||
| 252 | } | 278 | } | ||
| 253 | 279 | ||||
| @@ -258,6 +284,8 @@ var xGLTextureBuilderSetHasMipmap func(uintptr, bool) | |||||
| 258 | // | 284 | // | ||
| 259 | // Typically, the `glGenerateMipmap` function is used to generate a mimap. | 285 | // Typically, the `glGenerateMipmap` function is used to generate a mimap. | ||
| 260 | func (x *GLTextureBuilder) SetHasMipmap(HasMipmapVar bool) { | 286 | func (x *GLTextureBuilder) SetHasMipmap(HasMipmapVar bool) { | ||
| 287 | + | core.LazyRegister(&xGLTextureBuilderSetHasMipmap, "GDK", "gdk_gl_texture_builder_set_has_mipmap", false) | |||
| 288 | + | ||||
| 261 | xGLTextureBuilderSetHasMipmap(x.GoPointer(), HasMipmapVar) | 289 | xGLTextureBuilderSetHasMipmap(x.GoPointer(), HasMipmapVar) | ||
| 262 | } | 290 | } | ||
| 263 | 291 | ||||
| @@ -267,6 +295,8 @@ var xGLTextureBuilderSetHeight func(uintptr, int) | |||||
| 267 | // | 295 | // | ||
| 268 | // The height must be set before calling [method@Gdk.GLTextureBuilder.build]. | 296 | // The height must be set before calling [method@Gdk.GLTextureBuilder.build]. | ||
| 269 | func (x *GLTextureBuilder) SetHeight(HeightVar int) { | 297 | func (x *GLTextureBuilder) SetHeight(HeightVar int) { | ||
| 298 | + | core.LazyRegister(&xGLTextureBuilderSetHeight, "GDK", "gdk_gl_texture_builder_set_height", false) | |||
| 299 | + | ||||
| 270 | xGLTextureBuilderSetHeight(x.GoPointer(), HeightVar) | 300 | xGLTextureBuilderSetHeight(x.GoPointer(), HeightVar) | ||
| 271 | } | 301 | } | ||
| 272 | 302 | ||||
| @@ -278,6 +308,8 @@ var xGLTextureBuilderSetId func(uintptr, uint) | |||||
| 278 | // | 308 | // | ||
| 279 | // The id must be set before calling [method@Gdk.GLTextureBuilder.build]. | 309 | // The id must be set before calling [method@Gdk.GLTextureBuilder.build]. | ||
| 280 | func (x *GLTextureBuilder) SetId(IdVar uint) { | 310 | func (x *GLTextureBuilder) SetId(IdVar uint) { | ||
| 311 | + | core.LazyRegister(&xGLTextureBuilderSetId, "GDK", "gdk_gl_texture_builder_set_id", false) | |||
| 312 | + | ||||
| 281 | xGLTextureBuilderSetId(x.GoPointer(), IdVar) | 313 | xGLTextureBuilderSetId(x.GoPointer(), IdVar) | ||
| 282 | } | 314 | } | ||
| 283 | 315 | ||||
| @@ -292,6 +324,8 @@ var xGLTextureBuilderSetSync func(uintptr, uintptr) | |||||
| 292 | // The texture builder does not destroy it and it is the callers | 324 | // The texture builder does not destroy it and it is the callers | ||
| 293 | // responsibility to make sure it doesn't leak. | 325 | // responsibility to make sure it doesn't leak. | ||
| 294 | func (x *GLTextureBuilder) SetSync(SyncVar uintptr) { | 326 | func (x *GLTextureBuilder) SetSync(SyncVar uintptr) { | ||
| 327 | + | core.LazyRegister(&xGLTextureBuilderSetSync, "GDK", "gdk_gl_texture_builder_set_sync", false) | |||
| 328 | + | ||||
| 295 | xGLTextureBuilderSetSync(x.GoPointer(), SyncVar) | 329 | xGLTextureBuilderSetSync(x.GoPointer(), SyncVar) | ||
| 296 | } | 330 | } | ||
| 297 | 331 | ||||
| @@ -308,6 +342,8 @@ var xGLTextureBuilderSetUpdateRegion func(uintptr, *cairo.Region) | |||||
| 308 | // | 342 | // | ||
| 309 | // An example would be a screen recording where only the mouse pointer moves. | 343 | // An example would be a screen recording where only the mouse pointer moves. | ||
| 310 | func (x *GLTextureBuilder) SetUpdateRegion(RegionVar *cairo.Region) { | 344 | func (x *GLTextureBuilder) SetUpdateRegion(RegionVar *cairo.Region) { | ||
| 345 | + | core.LazyRegister(&xGLTextureBuilderSetUpdateRegion, "GDK", "gdk_gl_texture_builder_set_update_region", false) | |||
| 346 | + | ||||
| 311 | xGLTextureBuilderSetUpdateRegion(x.GoPointer(), RegionVar) | 347 | xGLTextureBuilderSetUpdateRegion(x.GoPointer(), RegionVar) | ||
| 312 | } | 348 | } | ||
| 313 | 349 | ||||
| @@ -316,6 +352,8 @@ var xGLTextureBuilderSetUpdateTexture func(uintptr, uintptr) | |||||
| 316 | // Sets the texture to be updated by this texture. See | 352 | // Sets the texture to be updated by this texture. See | ||
| 317 | // [method@Gdk.GLTextureBuilder.set_update_region] for an explanation. | 353 | // [method@Gdk.GLTextureBuilder.set_update_region] for an explanation. | ||
| 318 | func (x *GLTextureBuilder) SetUpdateTexture(TextureVar *Texture) { | 354 | func (x *GLTextureBuilder) SetUpdateTexture(TextureVar *Texture) { | ||
| 355 | + | core.LazyRegister(&xGLTextureBuilderSetUpdateTexture, "GDK", "gdk_gl_texture_builder_set_update_texture", false) | |||
| 356 | + | ||||
| 319 | xGLTextureBuilderSetUpdateTexture(x.GoPointer(), TextureVar.GoPointer()) | 357 | xGLTextureBuilderSetUpdateTexture(x.GoPointer(), TextureVar.GoPointer()) | ||
| 320 | } | 358 | } | ||
| 321 | 359 | ||||
| @@ -325,6 +363,8 @@ var xGLTextureBuilderSetWidth func(uintptr, int) | |||||
| 325 | // | 363 | // | ||
| 326 | // The width must be set before calling [method@Gdk.GLTextureBuilder.build]. | 364 | // The width must be set before calling [method@Gdk.GLTextureBuilder.build]. | ||
| 327 | func (x *GLTextureBuilder) SetWidth(WidthVar int) { | 365 | func (x *GLTextureBuilder) SetWidth(WidthVar int) { | ||
| 366 | + | core.LazyRegister(&xGLTextureBuilderSetWidth, "GDK", "gdk_gl_texture_builder_set_width", false) | |||
| 367 | + | ||||
| 328 | xGLTextureBuilderSetWidth(x.GoPointer(), WidthVar) | 368 | xGLTextureBuilderSetWidth(x.GoPointer(), WidthVar) | ||
| 329 | } | 369 | } | ||
| 330 | 370 | ||||
| @@ -465,38 +505,4 @@ func (x *GLTextureBuilder) GetPropertyWidth() int { | |||||
| 465 | func init() { | 505 | func init() { | ||
| 466 | core.SetPackageName("GDK", "gtk4") | 506 | core.SetPackageName("GDK", "gtk4") | ||
| 467 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 507 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 468 | - | var libs []uintptr | |||
| 469 | - | for _, libPath := range core.GetPaths("GDK") { | |||
| 470 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 471 | - | if err != nil { | |||
| 472 | - | panic(err) | |||
| 473 | - | } | |||
| 474 | - | libs = append(libs, lib) | |||
| 475 | - | } | |||
| 476 | - | ||||
| 477 | - | core.PuregoSafeRegister(&xGLTextureBuilderGLibType, libs, "gdk_gl_texture_builder_get_type") | |||
| 478 | - | ||||
| 479 | - | core.PuregoSafeRegister(&xNewGLTextureBuilder, libs, "gdk_gl_texture_builder_new") | |||
| 480 | - | ||||
| 481 | - | core.PuregoSafeRegister(&xGLTextureBuilderBuild, libs, "gdk_gl_texture_builder_build") | |||
| 482 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetColorState, libs, "gdk_gl_texture_builder_get_color_state") | |||
| 483 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetContext, libs, "gdk_gl_texture_builder_get_context") | |||
| 484 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetFormat, libs, "gdk_gl_texture_builder_get_format") | |||
| 485 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHasMipmap, libs, "gdk_gl_texture_builder_get_has_mipmap") | |||
| 486 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHeight, libs, "gdk_gl_texture_builder_get_height") | |||
| 487 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetId, libs, "gdk_gl_texture_builder_get_id") | |||
| 488 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetSync, libs, "gdk_gl_texture_builder_get_sync") | |||
| 489 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateRegion, libs, "gdk_gl_texture_builder_get_update_region") | |||
| 490 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateTexture, libs, "gdk_gl_texture_builder_get_update_texture") | |||
| 491 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetWidth, libs, "gdk_gl_texture_builder_get_width") | |||
| 492 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetColorState, libs, "gdk_gl_texture_builder_set_color_state") | |||
| 493 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetContext, libs, "gdk_gl_texture_builder_set_context") | |||
| 494 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetFormat, libs, "gdk_gl_texture_builder_set_format") | |||
| 495 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHasMipmap, libs, "gdk_gl_texture_builder_set_has_mipmap") | |||
| 496 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHeight, libs, "gdk_gl_texture_builder_set_height") | |||
| 497 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetId, libs, "gdk_gl_texture_builder_set_id") | |||
| 498 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetSync, libs, "gdk_gl_texture_builder_set_sync") | |||
| 499 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateRegion, libs, "gdk_gl_texture_builder_set_update_region") | |||
| 500 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateTexture, libs, "gdk_gl_texture_builder_set_update_texture") | |||
| 501 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetWidth, libs, "gdk_gl_texture_builder_set_width") | |||
| 502 | } | 508 | } | ||